Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 6 files). Show all
Unified · Split
| @@ -2869,8 +2869,7 @@ void HeightfieldRenderer::render(bool cursor) { · 2868 unmodified lines | |||
| 2869 | glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0); | 2869 | glDrawRangeElements(GL_TRIANGLES, 0, vertexCount - 1, indexCount, GL_UNSIGNED_INT, 0); |
| 2870 | 2870 | ||
| 2871 | glBindTexture(GL_TEXTURE_2D, 0); | 2871 | glBindTexture(GL_TEXTURE_2D, 0); |
| 2872 | glActiveTexture(GL_TEXTURE0); | 2872 | |
| 2873 | |||
| 2874 | Application::getInstance()->getTextureCache()->setPrimaryDrawBuffers(true, false); | 2873 | Application::getInstance()->getTextureCache()->setPrimaryDrawBuffers(true, false); |
| 2875 | 2874 | ||
| 2876 | DefaultMetavoxelRendererImplementation::getBaseHeightfieldProgram().release(); | 2875 | DefaultMetavoxelRendererImplementation::getBaseHeightfieldProgram().release(); |
| @@ -2946,14 +2945,14 @@ void HeightfieldRenderer::render(bool cursor) { · 69 unmodified lines | |||
| 2946 | glActiveTexture(GL_TEXTURE1); | 2945 | glActiveTexture(GL_TEXTURE1); |
| 2947 | glBindTexture(GL_TEXTURE_2D, 0); | 2946 | glBindTexture(GL_TEXTURE_2D, 0); |
| 2948 | 2947 | ||
| 2949 | glActiveTexture(GL_TEXTURE0); | ||
| 2950 | |||
| 2951 | DefaultMetavoxelRendererImplementation::getSplatHeightfieldProgram().release(); | 2948 | DefaultMetavoxelRendererImplementation::getSplatHeightfieldProgram().release(); |
| 2952 | 2949 | ||
| 2953 | glDisable(GL_POLYGON_OFFSET_FILL); | 2950 | glDisable(GL_POLYGON_OFFSET_FILL); |
| 2954 | glDepthMask(true); | 2951 | glDepthMask(true); |
| 2955 | glDepthFunc(GL_LESS); | 2952 | glDepthFunc(GL_LESS); |
| 2956 | } | 2953 | } |
| 2954 | glActiveTexture(GL_TEXTURE0); | ||
| 2955 | |||
| 2957 | glDisable(GL_CULL_FACE); | 2956 | glDisable(GL_CULL_FACE); |
| 2958 | 2957 | ||
| 2959 | glDisableClientState(GL_TEXTURE_COORD_ARRAY); | 2958 | glDisableClientState(GL_TEXTURE_COORD_ARRAY); |