mergenode: optimize so null textures (gaps, etc.) don't affect the hash

2020-05-06 16:14:27 +10:00
parent d49c6a059c
commit 78e305a593
2 changed files with 13 additions and 0 deletions
@@ -82,4 +82,15 @@ NodeInput *MergeNode::blend_in() const
  return blend_in_;
 }

+void MergeNode::Hash(QCryptographicHash &hash, const rational &time) const
+{
+  if (base_in_->IsConnected()) {
+    base_in_->get_connected_node()->Hash(hash, time);
+  }
+
+  if (blend_in_->IsConnected()) {
+    blend_in_->get_connected_node()->Hash(hash, time);
+  }
+}
+
 OLIVE_NAMESPACE_EXIT
@@ -45,6 +45,8 @@ public:
  NodeInput* base_in() const;
  NodeInput* blend_in() const;

+  virtual void Hash(QCryptographicHash &hash, const rational &time) const override;
+
 private:
  NodeInput* base_in_;