summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/shader.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-04-13 10:11:18 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-04-15 09:22:36 +0000
commit8067fa4fe6b2b3b8425101dde0c7976a18dedbc6 (patch)
tree5f887dce5e92d791e392eb5bd66f34992268dfd6 /src/render/materialsystem/shader.cpp
parent4c2a143b61e88001d1a98ee2f82c613123c87ab9 (diff)
Shader: use m_enabled member from base class
Change-Id: Iaf98b3a96b5820d704d8dd119aecbcdbd8d55db0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/materialsystem/shader.cpp')
-rw-r--r--src/render/materialsystem/shader.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index fa1a396b5..ae655ac6a 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -75,6 +75,7 @@ Shader::~Shader()
void Shader::cleanup()
{
+ QBackendNode::setEnabled(false);
m_isLoaded = false;
m_dna = 0;
// TO DO: ShaderProgram is leaked as of now
@@ -177,6 +178,8 @@ void Shader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
updateDNA();
markDirty(AbstractRenderer::AllDirty);
}
+
+ BackendNode::sceneChangeEvent(e);
}
QHash<QString, ShaderUniform> Shader::activeUniformsForUniformBlock(int blockIndex) const