[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54046] trunk/blender/source/blender/ blenlib/intern/math_matrix.c: Fix normalize_m4_m4 not working correct by not copying the entire matrix,

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Jan 23 15:37:13 CET 2013


Revision: 54046
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54046
Author:   blendix
Date:     2013-01-23 14:37:12 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Fix normalize_m4_m4 not working correct by not copying the entire matrix,
caused issue in blender internal with recent fix.

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

Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c	2013-01-23 14:19:01 UTC (rev 54045)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c	2013-01-23 14:37:12 UTC (rev 54046)
@@ -980,14 +980,8 @@
 
 void normalize_m4_m4(float rmat[4][4], float mat[4][4])
 {
-	float len;
-
-	len = normalize_v3_v3(rmat[0], mat[0]);
-	if (len != 0.0f) rmat[0][3] = mat[0][3] / len;
-	len = normalize_v3_v3(rmat[1], mat[1]);
-	if (len != 0.0f) rmat[1][3] = mat[1][3] / len;
-	len = normalize_v3_v3(rmat[2], mat[2]);
-	if (len != 0.0f) rmat[2][3] = mat[2][3] / len;
+	copy_m4_m4(rmat, mat);
+	normalize_m4(rmat);
 }
 
 void adjoint_m2_m2(float m1[2][2], float m[2][2])




More information about the Bf-blender-cvs mailing list