[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12137] trunk/blender/source/blender/ blenkernel/intern/constraint.c: Copy Rot.

[Joshua Leung]

Revision: 12137
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12137
Author:   aligorith
Date:     2007-09-25 02:15:21 +0200 (Tue, 25 Sep 2007)

Log Message:
-----------
Copy Rot. Constraint - Bugfix:

I've removed the quaternion-based rotation copying that I added during the recode as it was causing artifacts on some rigs.

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

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2007-09-25 00:05:53 UTC (rev 12136)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2007-09-25 00:15:21 UTC (rev 12137)
@@ -1819,7 +1819,6 @@
 			float	loc[3];
 			float	eul[3], obeul[3];
 			float	size[3];
-			short changed= 0;
 			
 			data = constraint->data;
 			
@@ -1831,40 +1830,27 @@
 			
 			if ((data->flag & ROTLIKE_X)==0) {
 				eul[0] = obeul[0];
-				changed = 1;
 			}
 			else if (data->flag & ROTLIKE_X_INVERT) {
 				eul[0] *= -1;
-				changed = 1;
 			}	
+			
 			if ((data->flag & ROTLIKE_Y)==0) {
 				eul[1] = obeul[1];
-				changed = 1;
 			}
 			else if (data->flag & ROTLIKE_Y_INVERT) {
 				eul[1] *= -1;
-				changed = 1;
 			}
+			
 			if ((data->flag & ROTLIKE_Z)==0) {
 				eul[2] = obeul[2];
-				changed = 1;
 			}
 			else if (data->flag & ROTLIKE_Z_INVERT) {
 				eul[2] *= -1;
-				changed = 1;
 			}
 			
-			
-			if (changed) {
-				compatible_eul(eul, obeul);
-				LocEulSizeToMat4(ownermat, loc, eul, size);
-			}
-			else {
-				float quat[4];
-				
-				Mat4ToQuat(targetmat, quat);
-				LocQuatSizeToMat4(ownermat, loc, quat, size);
-			}	
+			compatible_eul(eul, obeul);
+			LocEulSizeToMat4(ownermat, loc, eul, size);
 		}
 		break;
  	case CONSTRAINT_TYPE_SIZELIKE: