[Bf-blender-cvs] [1c31d62951c] temp-enum-socket: fix

Jacques Lucke noreply at git.blender.org
Mon Nov 8 16:07:04 CET 2021


Commit: 1c31d62951c57218edb12d42b900bf14b2a95da2
Author: Jacques Lucke
Date:   Mon Nov 8 15:24:21 2021 +0100
Branches: temp-enum-socket
https://developer.blender.org/rB1c31d62951c57218edb12d42b900bf14b2a95da2

fix

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

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

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 5999bca30e0..fdbb20a5608 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -716,6 +716,7 @@ void ntreeBlendReadData(BlendDataReader *reader, bNodeTree *ntree)
   ntree->execdata = nullptr;
 
   ntree->field_inferencing_interface = nullptr;
+  ntree->enum_inferencing_interface = nullptr;
 
   BLO_read_data_address(reader, &ntree->adt);
   BKE_animdata_blend_read_data(reader, ntree->adt);
@@ -4590,7 +4591,9 @@ void ntreeUpdateAllNew(Main *main)
         }
       }
 
-      ntreeUpdateTree(nullptr, ntree);
+      /* Ideally this would first sort the trees based on their dependencies and then update every
+       * tree just once. */
+      ntreeUpdateTree(main, ntree);
     }
   }
   FOREACH_NODETREE_END;



More information about the Bf-blender-cvs mailing list