[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27652] trunk/blender/source/blender: rotate_m4 was using degrees rather then radians.

Campbell Barton ideasman42 at gmail.com
Mon Mar 22 01:14:56 CET 2010


Revision: 27652
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27652
Author:   campbellbarton
Date:     2010-03-22 01:14:56 +0100 (Mon, 22 Mar 2010)

Log Message:
-----------
rotate_m4 was using degrees rather then radians.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/math_matrix.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c	2010-03-21 22:54:30 UTC (rev 27651)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c	2010-03-22 00:14:56 UTC (rev 27652)
@@ -943,20 +943,15 @@
     mat[3][2] += (Tx*mat[0][2] + Ty*mat[1][2] + Tz*mat[2][2]);
 }
 
-void rotate_m4(float mat[][4], char axis,float angle)
+void rotate_m4(float mat[][4], const char axis, const float angle)
 {
 	int col;
-    float temp[4];
+    float temp[4]= {0.0f, 0.0f, 0.0f, 0.0f};
     float cosine, sine;
 
-    for(col=0; col<4 ; col++)	/* init temp to zero matrix */
-        temp[col] = 0;
-
-    angle = (float)(angle*(3.1415926535/180.0));
     cosine = (float)cos(angle);
     sine = (float)sin(angle);
     switch(axis){
-    case 'x':    
     case 'X':    
         for(col=0 ; col<4 ; col++)
             temp[col] = cosine*mat[1][col] + sine*mat[2][col];
@@ -966,7 +961,6 @@
 	}
         break;
 
-    case 'y':
     case 'Y':
         for(col=0 ; col<4 ; col++)
             temp[col] = cosine*mat[0][col] - sine*mat[2][col];
@@ -976,7 +970,6 @@
         }
 	break;
 
-    case 'z':
     case 'Z':
         for(col=0 ; col<4 ; col++)
             temp[col] = cosine*mat[0][col] + sine*mat[1][col];

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-03-21 22:54:30 UTC (rev 27651)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-03-22 00:14:56 UTC (rev 27652)
@@ -1130,7 +1130,6 @@
 	char version_buf[128];
 	char revision_buf[128];
 	extern char build_rev[];
-	char *cp;
 	
 	version_str = &version_buf[0];
 	revision_str = &revision_buf[0];





More information about the Bf-blender-cvs mailing list