blender
/
blender
134
425
Fork 607
Code Issues 6.2k Pull Requests 777 Projects 19 Wiki Activity

Shading Nodes: Refactor Add menu #111798

Merged
Pablo Vazquez merged 2 commits from pablovazquez/blender:ui-nodes-shading-menu-refactor into main 2023-09-01 20:46:19 +02:00
Conversation 4 Commits 2 Files Changed 6 +18 -6
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1e704a27ce - Show all commits

6
scripts/startup/bl_ui/node_add_menu.py
View File

@ -75,8 +75,8 @@ def add_repeat_zone(layout, label):
return props
class NODE_MT_category_LAYOUT(Menu):
bl_idname = "NODE_MT_category_LAYOUT"
class NODE_MT_category_layout(Menu):
pablovazquez marked this conversation as resolved Outdated
Hans Goudey commented 2023-09-01 18:53:54 +02:00
Outdated
Review
Copy Link

NODE_MT_category_LAYOUT -> NODE_MT_category_layout. The only reason for the caps was to use the same menu idnames as before the refactor. Since this is different that doesn't matter anymore.

`NODE_MT_category_LAYOUT` -> `NODE_MT_category_layout`. The only reason for the caps was to use the same menu idnames as before the refactor. Since this is different that doesn't matter anymore.
bl_idname = "NODE_MT_category_layout"
bl_label = "Layout"
def draw(self, _context):
@ -87,7 +87,7 @@ class NODE_MT_category_LAYOUT(Menu):
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
classes = (
NODE_MT_category_LAYOUT,
NODE_MT_category_layout,
)
if __name__ == "__main__": # only for live edit.

2
scripts/startup/bl_ui/node_add_menu_compositor.py
View File

@ -336,7 +336,7 @@ class NODE_MT_compositing_node_add_all(Menu):
layout.menu("NODE_MT_category_COMP_VECTOR")
layout.separator()
layout.menu("NODE_MT_category_COMP_GROUP")
layout.menu("NODE_MT_category_LAYOUT")
layout.menu("NODE_MT_category_layout")
node_add_menu.draw_root_assets(layout)

2
scripts/startup/bl_ui/node_add_menu_geometry.py
View File

@ -679,7 +679,7 @@ class NODE_MT_geometry_node_add_all(Menu):
layout.menu("NODE_MT_category_GEO_UTILITIES")
layout.separator()
layout.menu("NODE_MT_category_GEO_GROUP")
layout.menu("NODE_MT_category_LAYOUT")
layout.menu("NODE_MT_category_layout")
node_add_menu.draw_root_assets(layout)

14
scripts/startup/bl_ui/node_add_menu_shading.py
View File

@ -203,6 +203,16 @@ class NODE_MT_category_SHADE_SCRIPT(Menu):
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
class NODE_MT_category_SHADE_GROUP(Menu):
bl_idname = "NODE_MT_category_SHADE_GROUP"
bl_label = "Group"
def draw(self, context):
layout = self.layout
node_add_menu.draw_node_group_add_menu(context, layout)
node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
class NODE_MT_shading_node_add_all(Menu):
bl_idname = "NODE_MT_shading_node_add_all"
bl_label = "Add"
@ -220,7 +230,8 @@ class NODE_MT_shading_node_add_all(Menu):
layout.separator()
layout.menu("NODE_MT_category_SHADE_SCRIPT")
layout.separator()
layout.menu("NODE_MT_category_LAYOUT")
layout.menu("NODE_MT_category_SHADE_GROUP")
layout.menu("NODE_MT_category_layout")
node_add_menu.draw_root_assets(layout)
@ -235,6 +246,7 @@ classes = (
NODE_MT_category_SHADE_TEXTURE,
NODE_MT_category_SHADE_VECTOR,
NODE_MT_category_SHADE_SCRIPT,
NODE_MT_category_SHADE_GROUP,
)