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 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 67383276e2 - Show all commits

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

@ -79,9 +79,10 @@ const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf(const bool
const EnumPropertyItem generated_items[] = { const EnumPropertyItem generated_items[] = {
{ASSET_LIBRARY_ALL, {ASSET_LIBRARY_ALL,
"ALL", "ALL",
ICON_NONE, ICON_BLANK1,
"All", "All",
"Show assets from all of the listed asset libraries"}, "Show assets from all of the listed asset libraries"},
RNA_ENUM_ITEM_SEPR,
{ASSET_LIBRARY_LOCAL, {ASSET_LIBRARY_LOCAL,
"LOCAL", "LOCAL",
ICON_CURRENT_FILE, ICON_CURRENT_FILE,
@ -89,7 +90,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_NONE, ICON_BLANK1,
"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},
@ -121,7 +122,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_NONE, user_library->name, user_library->path}; enum_value, user_library->name, ICON_BLANK1, user_library->name, user_library->path};
RNA_enum_item_add(&item, &totitem, &tmp); RNA_enum_item_add(&item, &totitem, &tmp);
} }