svn merge ^/trunk/blender -r44562:45364
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 3 Apr 2012 11:55:39 +0000 (11:55 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 3 Apr 2012 11:55:39 +0000 (11:55 +0000)
commit244836b18da1bbb6be94b7a5353ae8beaff1eb9d
tree4ed1f20cb3fd9835b9eee8d49f3abfe4267c4008
parent4fb535070ecaae57dc3f6521e447d42c6cc57193
parenta7798884a5ab806723a9e773fbd3a387369786b0
svn merge ^/trunk/blender -r44562:45364
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c