Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch '0.9.5' of https://github.com/g-truc/glm into 0.9.5

Christophe Riccio 12 years ago
parent
c1e150e6ec 891d552d45
commit
5b7154468c
1 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 3 3
      glm/core/type_mat4x4.inl

+ 3 - 3
glm/core/type_mat4x4.inl
View File 

@@ -731,13 +731,13 @@ namespace detail
 
 		typename tmat4x4<T, P>::col_type const Mov1(v[1]);
 
 		typename tmat4x4<T, P>::col_type const Mov1(v[1]);
 
 		typename tmat4x4<T, P>::col_type const Mul0 = m[0] * Mov0;
 
 		typename tmat4x4<T, P>::col_type const Mul0 = m[0] * Mov0;
 
 		typename tmat4x4<T, P>::col_type const Mul1 = m[1] * Mov1;
 
 		typename tmat4x4<T, P>::col_type const Mul1 = m[1] * Mov1;
 
-		typename tmat4x4<T, P>::col_type const Add0 = Mul0 * Mul1;
 
+		typename tmat4x4<T, P>::col_type const Add0 = Mul0 + Mul1;
 
 		typename tmat4x4<T, P>::col_type const Mov2(v[2]);
 
 		typename tmat4x4<T, P>::col_type const Mov2(v[2]);
 
 		typename tmat4x4<T, P>::col_type const Mov3(v[3]);
 
 		typename tmat4x4<T, P>::col_type const Mov3(v[3]);
 
 		typename tmat4x4<T, P>::col_type const Mul2 = m[2] * Mov2;
 
 		typename tmat4x4<T, P>::col_type const Mul2 = m[2] * Mov2;
 
 		typename tmat4x4<T, P>::col_type const Mul3 = m[3] * Mov3;
 
 		typename tmat4x4<T, P>::col_type const Mul3 = m[3] * Mov3;
 
-		typename tmat4x4<T, P>::col_type const Add1 = Mul2 * Mul3;
 
-		typename tmat4x4<T, P>::col_type const Add2 = Add0 * Add1;
 
+		typename tmat4x4<T, P>::col_type const Add1 = Mul2 + Mul3;
 
+		typename tmat4x4<T, P>::col_type const Add2 = Add0 + Add1;
 
 		return Add2;
 
 		return Add2;
 
 
 
 /*
 
 /*