From bf5e5fd72ceab8d27e24175e3bcbab005da0b1b1 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 2 Sep 2014 12:31:25 -0700 Subject: [PATCH] Quick fix for base colors underneath terrain. --- interface/src/MetavoxelSystem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/MetavoxelSystem.cpp b/interface/src/MetavoxelSystem.cpp index 1d97dc94fc..89cb4e12bc 100644 --- a/interface/src/MetavoxelSystem.cpp +++ b/interface/src/MetavoxelSystem.cpp @@ -1050,8 +1050,8 @@ void DefaultMetavoxelRendererImplementation::init() { _baseHeightfieldProgram.bind(); _baseHeightfieldProgram.setUniformValue("heightMap", 0); _baseHeightfieldProgram.setUniformValue("diffuseMap", 1); - _baseHeightScaleLocation = _heightfieldProgram.uniformLocation("heightScale"); - _baseColorScaleLocation = _heightfieldProgram.uniformLocation("colorScale"); + _baseHeightScaleLocation = _baseHeightfieldProgram.uniformLocation("heightScale"); + _baseColorScaleLocation = _baseHeightfieldProgram.uniformLocation("colorScale"); _baseHeightfieldProgram.release(); _splatHeightfieldProgram.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() +