svn merge ^/trunk/blender -r44076:44118
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 12:08:06 +0000 (12:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 12:08:06 +0000 (12:08 +0000)
1  2 
source/blender/editors/object/object_edit.c
source/blender/makesrna/intern/rna_scene.c
source/creator/CMakeLists.txt

Simple merge