[Bf-blender-cvs] [a183cc3c4ef] functions: handle not-found linked groups better

Jacques Lucke noreply at git.blender.org
Fri Dec 20 15:03:27 CET 2019


Commit: a183cc3c4ef7aae246cbca5391c2bae70a2c66ba
Author: Jacques Lucke
Date:   Fri Dec 20 14:59:33 2019 +0100
Branches: functions
https://developer.blender.org/rBa183cc3c4ef7aae246cbca5391c2bae70a2c66ba

handle not-found linked groups better

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

M	release/scripts/startup/nodes/function_nodes/groups.py

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

diff --git a/release/scripts/startup/nodes/function_nodes/groups.py b/release/scripts/startup/nodes/function_nodes/groups.py
index 569eb63bfd1..544105fa82d 100644
--- a/release/scripts/startup/nodes/function_nodes/groups.py
+++ b/release/scripts/startup/nodes/function_nodes/groups.py
@@ -141,7 +141,7 @@ class GroupNode(bpy.types.Node, FunctionNode):
     )
 
     def declaration(self, builder: NodeBuilder):
-        if self.node_group is None:
+        if not isinstance(self.node_group, FunctionTree):
             return
 
         for input_node in self.node_group.get_input_nodes():
@@ -172,9 +172,12 @@ class GroupNode(bpy.types.Node, FunctionNode):
                 assert False
 
     def draw(self, layout):
+        layout.scale_y = 1.3
         if self.node_group is None:
-            layout.scale_y = 1.3
             self.invoke_group_selector(layout, "set_group", "Select Group", icon="NODETREE")
+        elif not isinstance(self.node_group, FunctionTree):
+            layout.label(text="Group not found!", icon="ERROR")
+            self.invoke_group_selector(layout, "set_group", "Change Group", icon="NODETREE")
 
     def draw_advanced(self, layout):
         col = layout.column()



More information about the Bf-blender-cvs mailing list