svn merge ^/trunk/blender -r46844:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 23 May 2012 10:56:06 +0000 (10:56 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 23 May 2012 10:56:06 +0000 (10:56 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c