From 0d3f9c740d8bcaa5a35d07b36e3a5e4dcc7bba5d Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 23 Jan 2015 11:14:17 -0800 Subject: [PATCH] duplicate cleaning code at the end of Model renderCore --- libraries/render-utils/src/Model.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 131cdae6ac..79f938e7f6 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -812,6 +812,15 @@ bool Model::renderCore(float alpha, RenderMode mode, RenderArgs* args) { GLBATCH(glCullFace)(GL_BACK); } + GLBATCH(glActiveTexture)(GL_TEXTURE0 + 1); + GLBATCH(glBindTexture)(GL_TEXTURE_2D, 0); + GLBATCH(glActiveTexture)(GL_TEXTURE0 + 2); + GLBATCH(glBindTexture)(GL_TEXTURE_2D, 0); + GLBATCH(glActiveTexture)(GL_TEXTURE0 + 3); + GLBATCH(glBindTexture)(GL_TEXTURE_2D, 0); + GLBATCH(glActiveTexture)(GL_TEXTURE0); + GLBATCH(glBindTexture)(GL_TEXTURE_2D, 0); + // deactivate vertex arrays after drawing GLBATCH(glDisableClientState)(GL_NORMAL_ARRAY); GLBATCH(glDisableClientState)(GL_VERTEX_ARRAY);