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

fix blenderplayer build

Browse Source 
GPU lib should not depend on editor (glutil) code.
This commit is contained in:
Mike Erwin
2017-03-21 19:36:29 -04:00
parent 0a274df536
commit 78878a132f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,6 @@
#define SUPPRESS_GENERIC_MATRIX_API #define SUPPRESS_GENERIC_MATRIX_API
#include "GPU_matrix.h" #include "GPU_matrix.h"
#include "BIF_glutil.h"
#include "BLI_math_matrix.h" #include "BLI_math_matrix.h"
#include "BLI_math_rotation.h" #include "BLI_math_rotation.h"
#include "BLI_math_vector.h" #include "BLI_math_vector.h"
@@ -191,7 +189,8 @@ void gpuLoadProjectionMatrix3D(const float m[4][4])
{ {
#if SUPPORT_LEGACY_MATRIX #if SUPPORT_LEGACY_MATRIX
if (state.mode == MATRIX_MODE_INACTIVE) { 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) { if (mode != GL_PROJECTION_MATRIX) {
glMatrixMode(GL_PROJECTION_MATRIX); glMatrixMode(GL_PROJECTION_MATRIX);
} }