From 58cbec72215d795948f7ed06cd9e6f199776806b Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Fri, 27 Mar 2009 12:22:04 +1000
Subject: Bug in QGLShaderProgram::addShader() that stopped partial shaders
 working.

---
 src/opengl/qglshaderprogram.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 934b5a5..3c19434 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -849,13 +849,16 @@ bool QGLShaderProgram::addShader(QGLShader *shader)
         return false;
     if (d->shaders.contains(shader))
         return true;    // Already added to this shader program.
-    if (d->program && shader && shader->d->shader) {
+    if (d->program && shader) {
         if (!shader->d->compiled)
             return false;
-        if (!shader->d->isPartial)
+        if (!shader->d->isPartial) {
+            if (!shader->d->shader)
+                return false;
             glAttachShader(d->program, shader->d->shader);
-        else
+        } else {
             d->hasPartialShaders = true;
+        }
         d->linked = false;  // Program needs to be relinked.
         d->shaders.append(shader);
         return true;
-- 
cgit v0.12