[Bf-blender-cvs] [9f839a2ff5] blender2.8: OpenGL: fix MVP matrix order

[Mike Erwin]

Commit: 9f839a2ff52ea4e56c037c466cf1f173725f32b6
Author: Mike Erwin
Date:   Sat Feb 18 19:53:55 2017 -0500
Branches: blender2.8
https://developer.blender.org/rB9f839a2ff52ea4e56c037c466cf1f173725f32b6

OpenGL: fix MVP matrix order

Numbers were correct but names were mixed up.

===================================================================

M	source/blender/gpu/intern/gpu_matrix.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_matrix.c b/source/blender/gpu/intern/gpu_matrix.c
index 2a77db6625..a987e3ba1c 100644
--- a/source/blender/gpu/intern/gpu_matrix.c
+++ b/source/blender/gpu/intern/gpu_matrix.c
@@ -595,28 +595,23 @@ const float *gpuGetProjectionMatrix3D(float m[4][4])
 
 const float *gpuGetModelViewProjectionMatrix3D(float m[4][4])
 {
+	if (m == NULL) {
+		static Mat4 temp;
+		m = temp;
+	}
+
 #if SUPPORT_LEGACY_MATRIX
 	if (state.mode == MATRIX_MODE_INACTIVE) {
-		if (m == NULL) {
-			static Mat4 temp;
-			m = temp;
-		}
-
 		Mat4 proj;
-		glGetFloatv(GL_MODELVIEW_MATRIX, (float*)proj);
-		glGetFloatv(GL_PROJECTION_MATRIX, (float*)m);
-		mul_m4_m4_post(m, proj);
+		glGetFloatv(GL_MODELVIEW_MATRIX, (float*)m);
+		glGetFloatv(GL_PROJECTION_MATRIX, (float*)proj);
+		mul_m4_m4_pre(m, proj);
 		return (const float*)m;
 	}
 #endif
 
 	BLI_assert(state.mode == MATRIX_MODE_3D);
 
-	if (m == NULL) {
-		static Mat4 temp;
-		m = temp;
-	}
-
 	mul_m4_m4m4(m, Projection3D, ModelView3D);
 	return (const float*)m;
 }