svn merge ^/trunk/blender -r47023:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000 (04:14 +0000)
1  2 
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c