[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16299] trunk/blender/source/blender/src/ editarmature.c: Bugfix:

[Joshua Leung]

Revision: 16299
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16299
Author:   aligorith
Date:     2008-08-29 13:15:24 +0200 (Fri, 29 Aug 2008)

Log Message:
-----------
Bugfix: 

* Roll is now correctly calculated for Apply Armature
* Scale on x,z axes is no longer cleared (only scale on y axis needs to be)

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

Modified: trunk/blender/source/blender/src/editarmature.c
===================================================================
--- trunk/blender/source/blender/src/editarmature.c	2008-08-29 10:47:53 UTC (rev 16298)
+++ trunk/blender/source/blender/src/editarmature.c	2008-08-29 11:15:24 UTC (rev 16299)
@@ -485,9 +485,9 @@
 			float premat[3][3], imat[3][3],pmat[3][3], tmat[3][3];
 			float delta[3], eul[3];
 			
-			/* obtain new auto-yrotation */
+			/* obtain new auto y-rotation */
 			VecSubf(delta, curbone->tail, curbone->head);
-			vec_roll_to_mat3(delta, curbone->roll, premat);
+			vec_roll_to_mat3(delta, 0.0, premat);
 			Mat3Inv(imat, premat);
 			
 			/* get pchan 'visual' matrix */
@@ -503,9 +503,8 @@
 		
 		/* clear transform values for pchan */
 		pchan->loc[0]= pchan->loc[1]= pchan->loc[2]= 0;
-		pchan->size[0]= pchan->size[1]= pchan->size[2]= 1;
 		pchan->quat[1]= pchan->quat[2]= pchan->quat[3]= 0;
-		pchan->quat[0]= 1;
+		pchan->quat[0]= pchan->size[1]= 1;
 	}
 	
 	/* convert editbones back to bones */