svn merge ^/trunk/blender -r45927:HEAD --accept=theirs-full
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 9 May 2012 14:55:50 +0000 (14:55 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Wed, 9 May 2012 14:55:50 +0000 (14:55 +0000)
This revision does not compile. code need to be merged in manualy.

1  2 
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c