[Bf-blender-cvs] [bbd6dc55d1b] master: Nodes: fix menu when there is no node tree

[Jacques Lucke]

Commit: bbd6dc55d1bc0218f982dbd865c3a209ebf731af
Author: Jacques Lucke
Date:   Wed Oct 27 15:23:27 2021 +0200
Branches: master
https://developer.blender.org/rBbbd6dc55d1bc0218f982dbd865c3a209ebf731af

Nodes: fix menu when there is no node tree

Previously, some submenus were empty.

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

M	release/scripts/startup/nodeitems_builtins.py

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

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index d822ed9599f..34f447a7108 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -87,8 +87,6 @@ def curve_node_items(context):
     space = context.space_data
     if not space:
         return
-    if not space.edit_tree:
-        return
 
     if geometry_nodes_legacy_poll(context):
         yield NodeItem("GeometryNodeLegacyCurveEndpoints")
@@ -137,8 +135,6 @@ def mesh_node_items(context):
     space = context.space_data
     if not space:
         return
-    if not space.edit_tree:
-        return
 
     if geometry_nodes_legacy_poll(context):
         yield NodeItem("GeometryNodeLegacyEdgeSplit", poll=geometry_nodes_legacy_poll)
@@ -164,8 +160,6 @@ def geometry_node_items(context):
     space = context.space_data
     if not space:
         return
-    if not space.edit_tree:
-        return
 
     if geometry_nodes_legacy_poll(context):
         yield NodeItem("GeometryNodeLegacyDeleteGeometry", poll=geometry_nodes_legacy_poll)
@@ -192,8 +186,6 @@ def geometry_input_node_items(context):
     space = context.space_data
     if not space:
         return
-    if not space.edit_tree:
-        return
 
     if geometry_nodes_legacy_poll(context):
         yield NodeItem("FunctionNodeLegacyRandomFloat")
@@ -223,8 +215,6 @@ def geometry_material_node_items(context):
     space = context.space_data
     if not space:
         return
-    if not space.edit_tree:
-        return
 
     if geometry_nodes_legacy_poll(context):
         yield NodeItem("GeometryNodeLegacyMaterialAssign")
@@ -246,8 +236,6 @@ def point_node_items(context):
     space = context.space_data
     if not space:
         return
-    if not space.edit_tree:
-        return
 
     if geometry_nodes_legacy_poll(context):
         yield NodeItem("GeometryNodeLegacyAlignRotationToVector", poll=geometry_nodes_legacy_poll)
@@ -273,15 +261,16 @@ def node_group_items(context):
     space = context.space_data
     if not space:
         return
-    ntree = space.edit_tree
-    if not ntree:
-        return
 
     yield NodeItemCustom(draw=group_tools_draw)
 
     yield NodeItem("NodeGroupInput", poll=group_input_output_item_poll)
     yield NodeItem("NodeGroupOutput", poll=group_input_output_item_poll)
 
+    ntree = space.edit_tree
+    if not ntree:
+        return
+
     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
 
     def contains_group(nodetree, group):