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)
1  2 
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

Simple merge