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)
commit428f031237b8ad10a7d85110857167c1d3f57415
treec3ebda9dd4ab5d01fe60301efd630c613819efb2
parent77223492fd63f061b145b29bde5790fa1dd58c46
parent3ac1ad5378cbf64f823e53cff393351764e042a8
svn merge ^/trunk/blender -r44076:44118
source/blender/editors/object/object_edit.c
source/blender/makesrna/intern/rna_scene.c
source/creator/CMakeLists.txt