svn merge ^/trunk/blender -r45364:HEAD --accept postpone
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Thu, 12 Apr 2012 16:01:24 +0000 (16:01 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Thu, 12 Apr 2012 16:01:24 +0000 (16:01 +0000)
1  2 
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c