From 065d9848f7440b9a90a2ee18f26ca4f60c8c19a0 Mon Sep 17 00:00:00 2001
From: Felix Ungman <felix@ungman.com>
Date: Mon, 3 Jun 2013 12:58:44 +0200
Subject: [PATCH] Fixed operator*(mat4x4, vec4)

Calculate Add0, Add1, and Add2 using operator+ (instead of *)
---
 glm/core/type_mat4x4.inl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl
index 9e613d0f..ba9680f6 100644
--- a/glm/core/type_mat4x4.inl
+++ b/glm/core/type_mat4x4.inl
@@ -731,13 +731,13 @@ namespace detail
 		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 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 Mov3(v[3]);
 		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 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;
 
 /*