[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32595] trunk/blender/source/blender/ editors/transform: Cancelling rotation on axis/ angle object rotation didnt restore the original rotation.

[Campbell Barton]

Revision: 32595
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32595
Author:   campbellbarton
Date:     2010-10-19 13:15:08 +0200 (Tue, 19 Oct 2010)

Log Message:
-----------
Cancelling rotation on axis/angle object rotation didnt restore the original rotation.
also commented drotAxis/Angle since its not used yet.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.h
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/source/blender/editors/transform/transform.h
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.h	2010-10-19 10:32:02 UTC (rev 32594)
+++ trunk/blender/source/blender/editors/transform/transform.h	2010-10-19 11:15:08 UTC (rev 32595)
@@ -131,8 +131,8 @@
 
 typedef struct TransDataExtension {
 	float drot[3];		 /* Initial object drot */
-	float drotAngle;	 /* Initial object drotAngle */
-	float drotAxis[3];	 /* Initial object drotAxis */
+	// float drotAngle;	 /* Initial object drotAngle,    TODO: not yet implimented */
+	// float drotAxis[3];	 /* Initial object drotAxis, TODO: not yet implimented */
 	float dquat[4];		 /* Initial object dquat */
 	float dsize[3];		 /* Initial object dsize */
 	float *rot;          /* Rotation of the data to transform (Faculative)                                 */

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-10-19 10:32:02 UTC (rev 32594)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-10-19 11:15:08 UTC (rev 32595)
@@ -4298,8 +4298,8 @@
 		
 		td->ext->irotAngle= ob->rotAngle;
 		VECCOPY(td->ext->irotAxis, ob->rotAxis);
-		td->ext->drotAngle= ob->drotAngle;
-		VECCOPY(td->ext->drotAxis, ob->drotAxis);
+		// td->ext->drotAngle= ob->drotAngle;			// XXX, not implimented
+		// VECCOPY(td->ext->drotAxis, ob->drotAxis);	// XXX, not implimented
 	}
 	else {
 		td->ext->rot= NULL;

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2010-10-19 10:32:02 UTC (rev 32594)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2010-10-19 11:15:08 UTC (rev 32595)
@@ -1177,6 +1177,13 @@
 		if (td->ext->rot) {
 			VECCOPY(td->ext->rot, td->ext->irot);
 		}
+		if(td->ext->rotAngle) {
+			*td->ext->rotAngle= td->ext->irotAngle;
+		}
+		if(td->ext->rotAxis) {
+			VECCOPY(td->ext->rotAxis, td->ext->irotAxis);
+		}
+		/* XXX, drotAngle & drotAxis not used yet */
 		if (td->ext->size) {
 			VECCOPY(td->ext->size, td->ext->isize);
 		}