[Bf-blender-cvs] [2be7b2aaf9c] geometry-nodes: Geometry Nodes: better handle link cycles
Jacques Lucke
noreply at git.blender.org
Thu Nov 12 13:31:04 CET 2020
Commit: 2be7b2aaf9c9179686320c683942dc6deec85c1c
Author: Jacques Lucke
Date: Thu Nov 12 12:58:27 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rB2be7b2aaf9c9179686320c683942dc6deec85c1c
Geometry Nodes: better handle link cycles
===================================================================
M source/blender/modifiers/intern/MOD_nodes.cc
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 4aa17936caa..1791ab1fcc6 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -814,6 +814,11 @@ static GeometrySetPtr modifyGeometry(ModifierData *md,
NodeTreeRefMap tree_refs;
DerivedNodeTree tree{nmd->node_group, tree_refs};
+ if (tree.has_link_cycles()) {
+ BKE_modifier_set_error(ctx->object, md, "Node group has cycles");
+ return input_geometry_set;
+ }
+
Span<const DNode *> input_nodes = tree.nodes_by_type("NodeGroupInput");
Span<const DNode *> output_nodes = tree.nodes_by_type("NodeGroupOutput");
More information about the Bf-blender-cvs
mailing list