[Bf-blender-cvs] [cbe05edde59] master: Compositor: Fix crash when hashing unconnected operations

Manuel Castilla noreply at git.blender.org
Sat Sep 11 18:07:21 CEST 2021


Commit: cbe05edde59637a3e5a34ca0794aef2ad56faae2
Author: Manuel Castilla
Date:   Sat Sep 11 15:11:59 2021 +0200
Branches: master
https://developer.blender.org/rBcbe05edde59637a3e5a34ca0794aef2ad56faae2

Compositor: Fix crash when hashing unconnected operations

It was causing some tests to fail when enabling Full Frame mode.

===================================================================

M	source/blender/compositor/intern/COM_NodeOperation.cc

===================================================================

diff --git a/source/blender/compositor/intern/COM_NodeOperation.cc b/source/blender/compositor/intern/COM_NodeOperation.cc
index a87485fd51c..3bbd1b22d60 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cc
+++ b/source/blender/compositor/intern/COM_NodeOperation.cc
@@ -63,6 +63,10 @@ std::optional<NodeOperationHash> NodeOperation::generate_hash()
 
   hash.parents_hash_ = 0;
   for (NodeOperationInput &socket : m_inputs) {
+    if (!socket.isConnected()) {
+      continue;
+    }
+
     NodeOperation &input = socket.getLink()->getOperation();
     const bool is_constant = input.get_flags().is_constant_operation;
     combine_hashes(hash.parents_hash_, get_default_hash(is_constant));



More information about the Bf-blender-cvs mailing list