blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Use asset icon for "Mark Asset" in menus #112111

Merged
Pablo Vazquez merged 2 commits from pablovazquez/blender:ui-menus-mark-asset-icon into main 2023-09-08 15:40:07 +02:00
Conversation 4 Commits 2 Files Changed 3 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,7 +344,7 @@ class OUTLINER_MT_asset(Menu):
def draw(self, _context):
layout = self.layout
layout.operator("asset.mark")
layout.operator("asset.mark", icon="ASSET_MANAGER")
layout.operator("asset.clear", text="Clear Asset").set_fake_user = False
layout.operator("asset.clear", text="Clear Asset (Set Fake User)").set_fake_user = True

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

@ -2601,7 +2601,7 @@ class VIEW3D_MT_object(Menu):
layout.separator()
layout.menu("VIEW3D_MT_object_asset")
layout.menu("VIEW3D_MT_object_asset", icon="ASSET_MANAGER")
layout.menu("VIEW3D_MT_object_parent")
layout.menu("VIEW3D_MT_object_collection")
layout.menu("VIEW3D_MT_object_relations")

2
source/blender/editors/interface/interface_context_menu.cc
View File

@ -966,7 +966,7 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but, const wmEvent *ev
* which isn't cheap to check. */
uiLayout *sub = uiLayoutColumn(layout, true);
uiLayoutSetEnabled(sub, !id->asset_data);
uiItemO(sub, nullptr, ICON_NONE, "ASSET_OT_mark");
uiItemO(sub, nullptr, ICON_ASSET_MANAGER, "ASSET_OT_mark");
sub = uiLayoutColumn(layout, true);
uiLayoutSetEnabled(sub, id->asset_data);
uiItemO(sub, nullptr, ICON_NONE, "ASSET_OT_clear");