[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11366] trunk/blender/source/blender/src/ transform_conversions.c: Transform - Objects with Old-Tracking:

[Joshua Leung]

Revision: 11366
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11366
Author:   aligorith
Date:     2007-07-25 13:38:50 +0200 (Wed, 25 Jul 2007)

Log Message:
-----------
Transform - Objects with Old-Tracking:

Tracking is now tempolarily disabled while an object matrix used for space conversions stuff is calculated. This used to be done before the constraints recode.

Modified Paths:
--------------
    trunk/blender/source/blender/src/transform_conversions.c

Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c	2007-07-25 04:45:20 UTC (rev 11365)
+++ trunk/blender/source/blender/src/transform_conversions.c	2007-07-25 11:38:50 UTC (rev 11366)
@@ -2092,13 +2092,26 @@
 /* transcribe given object into TransData for Transforming */
 static void ObjectToTransData(TransData *td, Object *ob) 
 {
+	Object *track;
 	float obmtx[3][3];
 
 	/* axismtx has the real orientation */
 	Mat3CpyMat4(td->axismtx, ob->obmat);
 	Mat3Ortho(td->axismtx);
 
-	where_is_object(ob);
+	/* hack: tempolarily disable tracking when getting object matrix, 
+	 *		to stop it from screwing up space conversion matrix later
+	 */
+	if (ob->track) {
+		track= ob->track;
+		ob->track= NULL;
+		
+		where_is_object(ob);
+		
+		ob->track= track;
+	}
+	else
+		where_is_object(ob);
 
 	td->ob = ob;