[Bf-blender-cvs] [a87d78860b3] blender-v3.4-release: Fix T102693: adding shader node group to geometry nodes crashes

Jacques Lucke noreply at git.blender.org
Wed Nov 23 17:01:58 CET 2022


Commit: a87d78860b3c5a5ba89b0c05c59201997dac6350
Author: Jacques Lucke
Date:   Wed Nov 23 17:01:49 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rBa87d78860b3c5a5ba89b0c05c59201997dac6350

Fix T102693: adding shader node group to geometry nodes crashes

This is not supported currently, so just cancelling the operation
solves it. This might be supported in the future.

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

M	source/blender/nodes/intern/node_common.cc

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

diff --git a/source/blender/nodes/intern/node_common.cc b/source/blender/nodes/intern/node_common.cc
index d7cc0b6065a..f58b102ed3e 100644
--- a/source/blender/nodes/intern/node_common.cc
+++ b/source/blender/nodes/intern/node_common.cc
@@ -101,6 +101,10 @@ bool nodeGroupPoll(const bNodeTree *nodetree,
     }
     return false;
   }
+  if (nodetree->type != grouptree->type) {
+    *r_disabled_hint = TIP_("Node group has different type");
+    return false;
+  }
 
   LISTBASE_FOREACH (const bNode *, node, &grouptree->nodes) {
     if (node->typeinfo->poll_instance &&



More information about the Bf-blender-cvs mailing list