[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51864] trunk/blender/source/blender/ editors/object/object_transform.c: Bugfix #32987

Ton Roosendaal ton at blender.org
Sun Nov 4 13:34:03 CET 2012


Revision: 51864
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51864
Author:   ton
Date:     2012-11-04 12:33:58 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Bugfix #32987

"Set origin to cursor" tool failed for parented/rotated objects.
Matrix mashup.

Thanks to Ben Batt for the fix!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_transform.c

Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c	2012-11-04 12:13:26 UTC (rev 51863)
+++ trunk/blender/source/blender/editors/object/object_transform.c	2012-11-04 12:33:58 UTC (rev 51864)
@@ -903,11 +903,16 @@
 			/* offset other selected objects */
 			if (do_inverse_offset && (centermode != GEOMETRY_TO_ORIGIN)) {
 				CollectionPointerLink *ctx_link_other;
+				float obmat[4][4];
 
 				/* was the object data modified
 				 * note: the functions above must set 'cent' */
+
+				/* convert the offset to parent space */
+				BKE_object_to_mat4(ob, obmat);
 				copy_v3_v3(centn, cent);
-				mul_mat3_m4_v3(ob->obmat, centn); /* ommit translation part */
+				mul_mat3_m4_v3(obmat, centn); /* omit translation part */
+
 				add_v3_v3(ob->loc, centn);
 
 				BKE_object_where_is_calc(scene, ob);




More information about the Bf-blender-cvs mailing list