[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42446] branches/soc-2011-tomato/source/ blender/editors/space_clip/tracking_ops.c: Object tracking: fix setting axis in cases when object is scaled

[Sergey Sharybin]

Revision: 42446
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42446
Author:   nazgul
Date:     2011-12-05 20:07:13 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Object tracking: fix setting axis in cases when object is scaled

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-12-05 19:54:59 UTC (rev 42445)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-12-05 20:07:13 UTC (rev 42446)
@@ -2094,6 +2094,12 @@
 		mul_m4_m4m4(mat, obmat, mat);
 	}
 	else {
+		float lmat[4][4], ilmat[4][4], m[4][4];
+
+		unit_m4(lmat);
+		copy_v3_v3(lmat[3], obmat[3]);
+		invert_m4_m4(ilmat, lmat);
+
 		if(!flip) {
 			float rmat[3][3], tmat[4][4];
 
@@ -2104,7 +2110,7 @@
 			mul_m4_m4m4(mat, mat, tmat);
 		}
 
-		mul_m4_m4m4(mat, mat, obmat);
+		mul_serie_m4(mat, lmat, mat, ilmat, obmat, NULL, NULL, NULL, NULL);
 	}
 
 	object_apply_mat4(ob, mat, 0, 0);