Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +4 -16
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 36147cb8b8 - Show all commits

10
source/blender/editors/asset/intern/asset_library_reference_enum.cc
View File

@ -77,11 +77,7 @@ const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf(const bool
if (include_generated) { if (include_generated) {
const EnumPropertyItem generated_items[] = { const EnumPropertyItem generated_items[] = {
{ASSET_LIBRARY_ALL, {ASSET_LIBRARY_ALL, "ALL", 0, "All", "Show assets from all of the listed asset libraries"},
"ALL",
ICON_BLANK1,
"All",
"Show assets from all of the listed asset libraries"},
RNA_ENUM_ITEM_SEPR, RNA_ENUM_ITEM_SEPR,
{ASSET_LIBRARY_LOCAL, {ASSET_LIBRARY_LOCAL,
"LOCAL", "LOCAL",
@ -90,7 +86,7 @@ const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf(const bool
"Show the assets currently available in this Blender session"}, "Show the assets currently available in this Blender session"},
{ASSET_LIBRARY_ESSENTIALS, {ASSET_LIBRARY_ESSENTIALS,
"ESSENTIALS", "ESSENTIALS",
ICON_BLANK1, 0,
"Essentials", "Essentials",
"Show the basic building blocks and utilities coming with Blender"}, "Show the basic building blocks and utilities coming with Blender"},
{0, nullptr, 0, nullptr, nullptr}, {0, nullptr, 0, nullptr, nullptr},
@ -122,7 +118,7 @@ const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf(const bool
const int enum_value = ED_asset_library_reference_to_enum_value(&library_reference); const int enum_value = ED_asset_library_reference_to_enum_value(&library_reference);
/* Use library path as description, it's a nice hint for users. */ /* Use library path as description, it's a nice hint for users. */
EnumPropertyItem tmp = { EnumPropertyItem tmp = {
enum_value, user_library->name, ICON_BLANK1, user_library->name, user_library->path}; enum_value, user_library->name, ICON_NONE, user_library->name, user_library->path};
RNA_enum_item_add(&item, &totitem, &tmp); RNA_enum_item_add(&item, &totitem, &tmp);
} }

8
source/blender/editors/interface/interface.cc
View File

@ -4596,16 +4596,8 @@ static uiBut *ui_def_but_rna(uiBlock *block,
#endif #endif
} }
/* #ICON_BLANK1 can be used to add padding of the size of an icon. This is fine to align
* multiple items within a menu, but not for the menu button that only shows the label then.
*/
if ((type == UI_BTYPE_MENU) && (item[i].icon == ICON_BLANK1)) {
icon = ICON_NONE;
}
else {
icon = item[i].icon; icon = item[i].icon;
} }
}
else { else {
if (!str) { if (!str) {
if (type == UI_BTYPE_MENU) { if (type == UI_BTYPE_MENU) {