diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 22:37:36 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 22:37:36 +0300 |
| commit | 4948b6e226bb0352e0a6ead7dadddc33bb43c908 (patch) | |
| tree | 8b6286cacc944e26b979d8fb3f9b46578b22fe91 /source/gameengine/Ketsji | |
| parent | feff6b4df3bd156b2939c1b1bf79759bf479c368 (diff) | |
| parent | 0c4d949effa88f2ad54297a865fb2763f61c61aa (diff) | |
Merge remote-tracking branch 'origin/master' into pbr-merge
Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index 730e49c4918..cc7fea5ad25 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -420,14 +420,7 @@ int BL_Texture::GetMaxUnits() { if (g_max_units < 0) { GLint unit = 0; - - if (GPU_glsl_support()) { - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &unit); - } - else if (GLEW_ARB_multitexture) { - glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &unit); - } - + glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &unit); g_max_units = (MAXTEX >= unit) ? unit : MAXTEX; } |