svn merge ^/trunk/blender -r48095:48592
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 4 Jul 2012 15:56:42 +0000 (15:56 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 4 Jul 2012 15:56:42 +0000 (15: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