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)
commit7247af6af50ac0e5ee4aa5730e233e6340a3cf19
treeb380a995c36b687bc7ac99d19702b8a89f1e7e8c
parent30085e5ea96dcec5ef0afd239fbd33760cee83ce
parent9e0dd178134a973b9091705fd62f12ed9ea6434c
svn merge ^/trunk/blender -r48592:HEAD
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