[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32000] trunk/blender/source/blender/ blenkernel/intern/object.c: bugfix [#22767] parenting object causes rotation/scale/ location information to be corrupted

[Campbell Barton]

Revision: 32000
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32000
Author:   campbellbarton
Date:     2010-09-18 16:47:59 +0200 (Sat, 18 Sep 2010)

Log Message:
-----------
bugfix [#22767] parenting object causes rotation/scale/location information to be corrupted

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/object.c

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2010-09-18 12:50:45 UTC (rev 31999)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2010-09-18 14:47:59 UTC (rev 32000)
@@ -1690,11 +1690,29 @@
 /* see pchan_apply_mat4() for the equivalent 'pchan' function */
 void object_apply_mat4(Object *ob, float mat[][4])
 {
-	float mat3[3][3];
+	float mat3[3][3], tmat[3][3], imat[3][3];
+
+	/* location */
 	copy_v3_v3(ob->loc, mat[3]);
-	mat4_to_size(ob->size, mat);
+	
+	/* rotation */
 	copy_m3_m4(mat3, mat);
 	object_mat3_to_rot(ob, mat3, 0);
+	
+	/* scale */
+#if 0
+	/* works fine except for neg scales */
+	mat4_to_size(ob->size, mat);
+#else
+	/* this is more complicated but works for negative scales */
+	object_rot_to_mat3(ob, tmat);
+	invert_m3_m3(imat, tmat);
+	mul_m3_m3m3(tmat, imat, mat3);
+
+	ob->size[0]= tmat[0][0];
+	ob->size[1]= tmat[1][1];
+	ob->size[2]= tmat[2][2];
+#endif
 }
 
 void object_to_mat3(Object *ob, float mat[][3])	/* no parent */