summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-03-27 02:34:48 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-04-03 09:14:12 (GMT)
commit0cbe2a23966116e642fee4ccc34aeac73a5c57cd (patch)
treeb3b78803a890782a64785e82f4c9356e23c8d693
parent0b97a00eae721304a31642fcb8892b66fb670f9e (diff)
downloadQt-0cbe2a23966116e642fee4ccc34aeac73a5c57cd.zip
Qt-0cbe2a23966116e642fee4ccc34aeac73a5c57cd.tar.gz
Qt-0cbe2a23966116e642fee4ccc34aeac73a5c57cd.tar.bz2
Fix loading of partial shaders from files.
-rw-r--r--src/opengl/qglshaderprogram.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 3c19434..5738acd 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -573,9 +573,6 @@ bool QGLShader::setSourceCode(const QString& source)
*/
bool QGLShader::setSourceCodeFile(const QString& fileName)
{
- if (!d->shader)
- return false;
-
QFile file(fileName);
if (!file.open(QFile::ReadOnly)) {
qWarning() << "QGLShader: Unable to open file" << fileName;