Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-01-23 18:37:12 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-01-23 18:37:12 +0400
commit8f863ec625661007a3c2f35b98f2e32c7ca9890f (patch)
treefdb3807e03f5667387f0d9f254d6d5b95623cc06 /source/blender/blenlib/intern/math_matrix.c
parent456a2d9de7e54ccba73a954a7fed64cee33d1d56 (diff)
Fix normalize_m4_m4 not working correct by not copying the entire matrix,
caused issue in blender internal with recent fix.
Diffstat (limited to 'source/blender/blenlib/intern/math_matrix.c')
-rw-r--r--source/blender/blenlib/intern/math_matrix.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index 03f8d63024e..8f9ea917b8c 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -980,14 +980,8 @@ void normalize_m4(float mat[4][4])
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])