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)
commite1250f2168b813a09d4b3b6577eae693bc219dee
treea2fcd3a384dfa7492de9f86718ca4de81b4b19aa
parent5600d214f1f2f05e98fd6f4d5f86bdff01e8b3f8
parentd498dd393970c4bfddaf3236433171c4274776d8
svn merge ^/trunk/blender -r41954:41961
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/intern/rna_scene.c