[Bf-blender-cvs] [ce16fa0f4c4] master: Fix: Node Editor: Hide compoitor-specific menu items
Hans Goudey
noreply at git.blender.org
Fri Dec 2 21:32:00 CET 2022
Commit: ce16fa0f4c4661fa1329f53896f4d908699627c6
Author: Hans Goudey
Date: Fri Dec 2 14:30:54 2022 -0600
Branches: master
https://developer.blender.org/rBce16fa0f4c4661fa1329f53896f4d908699627c6
Fix: Node Editor: Hide compoitor-specific menu items
Previews and the "Read Viewlayers" operator are specific to the
compositor and shouldn't show in other node editor types.
===================================================================
M release/scripts/startup/bl_ui/space_node.py
M source/blender/editors/space_node/node_edit.cc
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index da94350b428..194f40e9434 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -307,8 +307,10 @@ class NODE_MT_select(Menu):
class NODE_MT_node(Menu):
bl_label = "Node"
- def draw(self, _context):
+ def draw(self, context):
layout = self.layout
+ snode = context.space_data
+ is_compositor = snode.tree_type == 'CompositorNodeTree'
layout.operator("transform.translate")
layout.operator("transform.rotate")
@@ -346,14 +348,17 @@ class NODE_MT_node(Menu):
layout.operator("node.hide_toggle")
layout.operator("node.mute_toggle")
- layout.operator("node.preview_toggle")
+ if is_compositor:
+ layout.operator("node.preview_toggle")
layout.operator("node.hide_socket_toggle")
layout.operator("node.options_toggle")
layout.operator("node.collapse_hide_unused_toggle")
- layout.separator()
- layout.operator("node.read_viewlayers")
+ if is_compositor:
+ layout.separator()
+
+ layout.operator("node.read_viewlayers")
class NODE_MT_view_pie(Menu):
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 38af2669bdc..95f64999f6e 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -1709,7 +1709,7 @@ void NODE_OT_preview_toggle(wmOperatorType *ot)
/* callbacks */
ot->exec = node_preview_toggle_exec;
- ot->poll = ED_operator_node_active;
+ ot->poll = composite_node_active;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
More information about the Bf-blender-cvs
mailing list