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)
commit736daa9f046958195112a46df084525120bacec2
tree5c6e5705479db19fdeedf0b20514284a32072034
parentc4c75c33d0dd3222285b6799da3656316776592a
parentc0f59c44f8f4a15368335337adc7b9aafbe3fca6
svn merge ^/trunk/blender -r46844:HEAD
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c