History

Merge pull request #4256 from samcake/temp1

Getting rid of glLIghts and replacing by the model::Light

Brad Hefta-Gaub committed 11 years ago

Commit 1827d9f2 parents d69efa0 11beb5123 files · +950 −396Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 23 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+3−3
@@ -1154,7 +1154,7 @@ void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxC · 1153 unmodified lines
11541154
11551155 gpu::Batch batch;
11561156
1157− glEnable(GL_TEXTURE_2D);
1157+// glEnable(GL_TEXTURE_2D);
11581158 //glBindTexture(GL_TEXTURE_2D, _currentTextureID); // this is quad specific...
11591159
11601160 batch.setInputFormat(details.streamFormat);
@@ -1168,8 +1168,8 @@ void GeometryCache::renderQuad(const glm::vec2& minCorner, const glm::vec2& maxC · 7 unmodified lines
11681168 glDisableClientState(GL_COLOR_ARRAY);
11691169
11701170 glBindBuffer(GL_ARRAY_BUFFER, 0);
1171− glBindTexture(GL_TEXTURE_2D, 0);
1172− glDisable(GL_TEXTURE_2D);
1171+ // glBindTexture(GL_TEXTURE_2D, 0);
1172+ // glDisable(GL_TEXTURE_2D);
11731173 }
11741174
11751175 void GeometryCache::renderQuad(const glm::vec3& minCorner, const glm::vec3& maxCorner, const glm::vec4& color, int id) {