svn merge ^/trunk/blender -r46750:HEAD
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 21 May 2012 15:14:32 +0000 (15:14 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 21 May 2012 15:14:32 +0000 (15:14 +0000)
commit7d1cfe4daea8cc0f5004e8afe8307fe58bf7a2e0
treebd94735918d05470f3b2bd2cba0f1509a55bc914
parent74a889d8b1a8e9f83214fa885f530b7b167b4a32
parentc55bb6eae27142a34446440ef3433d5bd7597598
svn merge ^/trunk/blender -r46750:HEAD
source/blender/editors/object/object_ops.c