[Bf-blender-cvs] [7241ab6ede0] master: Revert "Fix: don't set default value for unused socket in geometry nodes"

Hans Goudey noreply at git.blender.org
Mon Jan 16 23:58:48 CET 2023


Commit: 7241ab6ede0b184468a812554663531e68c0fda9
Author: Hans Goudey
Date:   Mon Jan 16 16:58:24 2023 -0600
Branches: master
https://developer.blender.org/rB7241ab6ede0b184468a812554663531e68c0fda9

Revert "Fix: don't set default value for unused socket in geometry nodes"

This reverts commit 154d3e95f862fd680879267b03bb050ffa178d05.

This caused crashes in the mouse house and flower shop benchmark files.
A proper solution will be investigated soon.

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

M	source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
index 3f994805682..a07cd1437d6 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
@@ -147,6 +147,7 @@ static void node_geo_exec(GeoNodeExecParams params)
 
   if (!attribute_id) {
     params.set_output("Geometry", geometry_set);
+    params.set_default_remaining_outputs();
     return;
   }



More information about the Bf-blender-cvs mailing list