svn merge ^/trunk/blender -r43183:43220
authorCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jan 2012 13:09:09 +0000 (13:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jan 2012 13:09:09 +0000 (13:09 +0000)
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/makesrna/intern/rna_scene.c

diff --cc CMakeLists.txt
Simple merge