From 3ab06c54bf6db08599a455da8e5a819da014aa8d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 20 Jan 2015 18:01:10 +0000
Subject: [PATCH] Re-enabled texturing and fixed runtime warning

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14667 16af8721-9629-0410-8352-f15c8da7e697
---
 src/osgTerrain/GeometryPool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osgTerrain/GeometryPool.cpp b/src/osgTerrain/GeometryPool.cpp
index 324a13c94..b1b41662c 100644
--- a/src/osgTerrain/GeometryPool.cpp
+++ b/src/osgTerrain/GeometryPool.cpp
@@ -599,7 +599,7 @@ osg::ref_ptr<osg::Program> GeometryPool::getOrCreateProgram(LayerTypes& layerTyp
 #endif
 
     bool useLighting = true;
-    bool useTextures = false;
+    bool useTextures = true;
 
     osg::ref_ptr<osg::Program> program = new osg::Program;
     _programMap[layerTypes] = program;
@@ -636,7 +636,7 @@ osg::ref_ptr<osg::Program> GeometryPool::getOrCreateProgram(LayerTypes& layerTyp
     if (_useGeometryShader)
     {
         #include "shaders/terrain_displacement_mapping_geom.cpp"
-        osg::ref_ptr<osg::Shader> shader = osgDB::readShaderFileWithFallback(osg::Shader::VERTEX, "shaders/terrain_displacement_mapping.geom", terrain_displacement_mapping_geom);
+        osg::ref_ptr<osg::Shader> shader = osgDB::readShaderFileWithFallback(osg::Shader::GEOMETRY, "shaders/terrain_displacement_mapping.geom", terrain_displacement_mapping_geom);
         program->addShader(shader.get());
 
         program->setParameter( GL_GEOMETRY_VERTICES_OUT_EXT, 4 );