svn merge ^/trunk/blender -r48592:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 9 Oct 2012 10:53:20 +0000 (10:53 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 9 Oct 2012 10:53:20 +0000 (10:53 +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
source/blender/editors/object/object_vgroup.c