Don't remove parameters in ShaderBuilder destructor

ovilab · Oct 14, 2016 · 505f041 · 505f041
1 parent 9d374f9
commit 505f041
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/shaderbuilder.cpp b/src/shaderbuilder.cpp
@@ -22,19 +22,11 @@ ShaderBuilder::ShaderBuilder(QNode *parent)
 
 ShaderBuilder::~ShaderBuilder()
 {
-    clear();
+    disconnectDependencies();
 }
 
-void ShaderBuilder::clear()
+void ShaderBuilder::disconnectDependencies()
 {
-    emit clearBegin();
-
-    if(m_renderPass) {
-        for(ShaderUniformValue *uniform : m_uniforms) {
-            m_renderPass->removeParameter(uniform->m_parameter);
-        }
-    }
-
     for(const auto& node : m_dependencies) {
         disconnect(node, &ShaderNode::headerChanged, this, &ShaderBuilder::markDirty);
         disconnect(node, &ShaderNode::resultChanged, this, &ShaderBuilder::markDirty);
@@ -44,6 +36,19 @@ void ShaderBuilder::clear()
         disconnect(node, &ShaderNode::propertyTypeChanged, this, &ShaderBuilder::markDirty);
         disconnect(node, &ShaderNode::markDirty, this, &ShaderBuilder::markDirty);
     }
+}
+
+void ShaderBuilder::clear()
+{
+    emit clearBegin();
+
+    if(m_renderPass) {
+        for(ShaderUniformValue *uniform : m_uniforms) {
+            m_renderPass->removeParameter(uniform->m_parameter);
+        }
+    }
+
+    disconnectDependencies();
 
     m_dependencies.clear();
 

diff --git a/src/shaderbuilder.h b/src/shaderbuilder.h
@@ -101,6 +101,7 @@ public slots:
 
     friend class ShaderBuilderMaterialBinding;
     Qt3DRender::QRenderPass* renderPass() const;
+    void disconnectDependencies();
 };
 
 #endif // SHADERBUILDER_H