[Bf-blender-cvs] [2bce3c0ac49] master: Fix: don't allow node identifiers to be zero

Jacques Lucke noreply at git.blender.org
Fri Dec 2 15:42:29 CET 2022


Commit: 2bce3c0ac49d3a3acf8028862db1c70f39d052a9
Author: Jacques Lucke
Date:   Fri Dec 2 15:41:58 2022 +0100
Branches: master
https://developer.blender.org/rB2bce3c0ac49d3a3acf8028862db1c70f39d052a9

Fix: don't allow node identifiers to be zero

Was missing in rB88c6d824e78ebe40b891.

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

M	source/blender/blenkernel/intern/node.cc

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 0f2b2e1c345..c712d7ff668 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -679,7 +679,7 @@ void ntreeBlendReadData(BlendDataReader *reader, ID *owner_id, bNodeTree *ntree)
 
     /* Create the `nodes_by_id` cache eagerly so it can be expected to be valid. Because
      * we create it here we also have to check for zero identifiers from previous versions. */
-    if (ntree->runtime->nodes_by_id.contains_as(node->identifier)) {
+    if (node->identifier == 0 || ntree->runtime->nodes_by_id.contains_as(node->identifier)) {
       nodeUniqueID(ntree, node);
     }
     else {



More information about the Bf-blender-cvs mailing list