[Bf-blender-cvs] [78878a132f] blender2.8: fix blenderplayer build

Mike Erwin noreply at git.blender.org
Wed Mar 22 00:38:50 CET 2017


Commit: 78878a132f45e110f99c25bc3b96555e26ac534a
Author: Mike Erwin
Date:   Tue Mar 21 19:36:29 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB78878a132f45e110f99c25bc3b96555e26ac534a

fix blenderplayer build

GPU lib should not depend on editor (glutil) code.

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

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 8cc5117631..0383fe89bf 100644
--- a/source/blender/gpu/intern/gpu_matrix.c
+++ b/source/blender/gpu/intern/gpu_matrix.c
@@ -32,8 +32,6 @@
 #define SUPPRESS_GENERIC_MATRIX_API
 #include "GPU_matrix.h"
 
-#include "BIF_glutil.h"
-
 #include "BLI_math_matrix.h"
 #include "BLI_math_rotation.h"
 #include "BLI_math_vector.h"
@@ -191,7 +189,8 @@ void gpuLoadProjectionMatrix3D(const float m[4][4])
 {
 #if SUPPORT_LEGACY_MATRIX
 	if (state.mode == MATRIX_MODE_INACTIVE) {
-		GLenum mode = glaGetOneInt(GL_MATRIX_MODE);
+		GLenum mode;
+		glGetIntegerv(GL_MATRIX_MODE, (GLint*)&mode);
 		if (mode != GL_PROJECTION_MATRIX) {
 			glMatrixMode(GL_PROJECTION_MATRIX);
 		}




More information about the Bf-blender-cvs mailing list