History

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Andrzej Kapolka committed 12 years ago

Commit 4e561c62 parents 50a250c d7a38e61 file · +2 −2Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 1 file). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+2−2
@@ -1105,8 +1105,8 @@ void DefaultMetavoxelRendererImplementation::init() { · 1104 unmodified lines
11051105 _baseHeightfieldProgram.bind();
11061106 _baseHeightfieldProgram.setUniformValue("heightMap", 0);
11071107 _baseHeightfieldProgram.setUniformValue("diffuseMap", 1);
1108− _baseHeightScaleLocation = _heightfieldProgram.uniformLocation("heightScale");
1109− _baseColorScaleLocation = _heightfieldProgram.uniformLocation("colorScale");
1108+ _baseHeightScaleLocation = _baseHeightfieldProgram.uniformLocation("heightScale");
1109+ _baseColorScaleLocation = _baseHeightfieldProgram.uniformLocation("colorScale");
11101110 _baseHeightfieldProgram.release();
11111111
11121112 _splatHeightfieldProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() +