archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OpenGL: fix MVP matrix order

Browse Source 
Numbers were correct but names were mixed up.
This commit is contained in:
Mike Erwin
2017-02-18 19:53:55 -05:00
parent fae895125e
commit 9f839a2ff5
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/gpu/intern/gpu_matrix.c
View File

@@ -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;
}