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)
commit93f22cf0125285edb2ee87efe63580f2e87ac0fd
treefc4705c9c841e062ee646f063211813487ba550b
parent244836b18da1bbb6be94b7a5353ae8beaff1eb9d
parent10a333556a5b7d05bb42e61e8f42dac10ed8cad1
svn merge ^/trunk/blender -r45364:HEAD --accept postpone
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c