svn merge ^/trunk/blender -r41954:41961
authorCampbell Barton <ideasman42@gmail.com>
Fri, 18 Nov 2011 09:34:45 +0000 (09:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 18 Nov 2011 09:34:45 +0000 (09:34 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/intern/rna_scene.c