Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlysse Martin <you.le@live.fr>2015-10-27 17:22:22 +0300
committerPorteries Tristan <republicthunderbolt9@gmail.com>2015-10-27 17:29:09 +0300
commitb2f57190d9f2cc3ece678ef788b42eefb5631a2e (patch)
tree31035428c29080cd8e7e1d1e9ef43f720132bbae /source/gameengine
parent3f85eeddaa8c6ab076c3d6e59b43d9915bcd9592 (diff)
BGE: Fix T43218: Text of framerate and profile glitch in Multitexture shading
Fix T43218: Text of framerate and profile glitch in Multitexture shading Reviewers: lordloki, panzergame Reviewed By: panzergame Subscribers: medved Projects: #game_engine Maniphest Tasks: T43218 Differential Revision: https://developer.blender.org/D1536
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index bd84c3c96b1..28545576f05 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -1362,9 +1362,13 @@ static void DisableForText()
for (int i=0; i<RAS_MAX_TEXCO; i++) {
glActiveTextureARB(GL_TEXTURE0_ARB+i);
- if (GLEW_ARB_texture_cube_map)
+ if (GLEW_ARB_texture_cube_map) {
glDisable(GL_TEXTURE_CUBE_MAP_ARB);
-
+ glDisable(GL_TEXTURE_GEN_S);
+ glDisable(GL_TEXTURE_GEN_T);
+ glDisable(GL_TEXTURE_GEN_Q);
+ glDisable(GL_TEXTURE_GEN_R);
+ }
glDisable(GL_TEXTURE_2D);
}