Merged changes in the trunk up to revision 38663.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Jul 2011 23:42:20 +0000 (23:42 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Jul 2011 23:42:20 +0000 (23:42 +0000)
commit46db54c8059aa86cef25c7ceddb1c104585614fc
tree0a7b05bb653de3a86a62ad64504dabad18160d4d
parent0a9094a8e30c86945a428d35d21fc683261cfe5c
parenta22de3f73c28b86f481376d52fbcfd7bb8ee25f2
Merged changes in the trunk up to revision 38663.
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c