Fix linux build error.

gwaldron · Feb 14, 2015 · 9e6cf52 · 9e6cf52
1 parent a4b7ea0
commit 9e6cf52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl b/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl
@@ -5,7 +5,6 @@ $GLSL_DEFAULT_PRECISION_FLOAT
 #pragma vp_location   "fragment_coloring"
 #pragma vp_order      "0"
 
-#define MP_USE_TERRAIN_COLOR
 #define MP_USE_BLENDING
 
 uniform vec4 oe_terrain_color;

diff --git a/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp b/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp
@@ -888,8 +888,8 @@ MPTerrainEngineNode::updateState()
                 Shaders::MPFragSource );
 
             // terrain background color; negative means use the vertex color.
-            terrainStateSet->getOrCreateUniform("oe_terrain_color", osg::Uniform::FLOAT_VEC4)
-                ->set( _terrainOptions.color().isSet()? _terrainOptions.color().get() : osg::Vec4f(-1,-1,-1,-1));
+            Color terrainColor = _terrainOptions.color().getOrUse( Color(-1,-1,-1,-1) );
+            terrainStateSet->addUniform(new osg::Uniform("oe_terrain_color", terrainColor));
 
             bool useBlending = _terrainOptions.enableBlending() == true;
             if ( !useBlending )