Saturday merger of bf-blender in orange branch.
authorTon Roosendaal <ton@blender.org>
Sat, 17 Dec 2005 20:25:41 +0000 (20:25 +0000)
committerTon Roosendaal <ton@blender.org>
Sat, 17 Dec 2005 20:25:41 +0000 (20:25 +0000)
commit510403277be6c5b34d01b386bfbf66871348f555
treecb7a57d6f52fa6fc733993aa58e5b76fe34cf23e
parent6d9cda7aaaf117d8043dc850289254dbf1da01b4
parent66d0d7e2dbd327988b7418f5ce1bd1cd4beb5927
Saturday merger of bf-blender in orange branch.
source/blender/blenloader/intern/readfile.c
source/blender/include/blendef.h
source/blender/makesdna/DNA_material_types.h
source/blender/src/buttons_shading.c
source/blender/src/header_oops.c
source/blender/src/outliner.c
source/blender/src/space.c
source/blender/src/toets.c