svn merge ^/trunk/blender -r44118:44136
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 18:32:08 +0000 (18:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 18:32:08 +0000 (18:32 +0000)
1  2 
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c