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)
commitd43e1fa7beb03368eaaa3c89ef95d69ebd693734
tree2a63c1d49c735c48edb1ee036a8db4e424293078
parenta953e4bbe33f24bef6fd018c7413e904a9628e5b
parent558721ab59bd4e6186005f5e9aca50e094c9e72c
svn merge ^/trunk/blender -r48095:48592
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c