From adbadd66be677e10e18c0d6288a0253e98f0a71d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 25 Jan 2016 10:25:15 +0000
Subject: [PATCH] From Patrick Neary, "In ShaderComposer::getOrCreateProgram(),
 tesselation control and evaluation shaders are processed but not added to the
 shader program."

---
 src/osg/ShaderComposer.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/osg/ShaderComposer.cpp b/src/osg/ShaderComposer.cpp
index a35ea52c4..09057b5a3 100644
--- a/src/osg/ShaderComposer.cpp
+++ b/src/osg/ShaderComposer.cpp
@@ -105,11 +105,21 @@ osg::Program* ShaderComposer::getOrCreateProgram(const ShaderComponents& shaderC
         addShaderToProgram(program.get(), vertexShaders);
     }
 
+     if (!tessControlShaders.empty())
+    {
+        addShaderToProgram(program.get(), tessControlShaders);
+    }
+
     if (!geometryShaders.empty())
     {
         addShaderToProgram(program.get(), geometryShaders);
     }
 
+     if (!tessEvaluationShaders.empty())
+    {
+        addShaderToProgram(program.get(), tessEvaluationShaders);
+    }
+
     if (!fragmentShaders.empty())
     {
         addShaderToProgram(program.get(), fragmentShaders);