diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-11-23 14:39:26 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-11-23 14:39:26 +0300 |
commit | f392ce50c476ebe0118dce2e6475617c454fc9a7 (patch) | |
tree | a23055ed73de8833526555fdbaaddf7b396a1f1b /source/blender/editors/asset/intern/asset_library_reference_enum.cc | |
parent | 605cdc4346e5f82c031c4a5d6ecd91bf8268f7ff (diff) | |
parent | cd2849c89b65131cc381a1bf9ab75527afd51a4f (diff) |
Merge remote-tracking branch 'origin/blender-v3.0-release'
Diffstat (limited to 'source/blender/editors/asset/intern/asset_library_reference_enum.cc')
-rw-r--r-- | source/blender/editors/asset/intern/asset_library_reference_enum.cc | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/source/blender/editors/asset/intern/asset_library_reference_enum.cc b/source/blender/editors/asset/intern/asset_library_reference_enum.cc index 1a2d3f5837a..a97af1b1cf4 100644 --- a/source/blender/editors/asset/intern/asset_library_reference_enum.cc +++ b/source/blender/editors/asset/intern/asset_library_reference_enum.cc @@ -98,25 +98,30 @@ AssetLibraryReference ED_asset_library_reference_from_enum_value(int value) * * Since this is meant for UI display, skips non-displayable libraries, that is, libraries with an * empty name or path. + * + * \param include_local_library whether to include the "Current File" library or not. */ -const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf() +const EnumPropertyItem *ED_asset_library_reference_to_rna_enum_itemf( + const bool include_local_library) { - const EnumPropertyItem predefined_items[] = { - /* For the future. */ - // {ASSET_REPO_BUNDLED, "BUNDLED", 0, "Bundled", "Show the default user assets"}, - {ASSET_LIBRARY_LOCAL, - "LOCAL", - ICON_BLENDER, - "Current File", - "Show the assets currently available in this Blender session"}, - {0, nullptr, 0, nullptr, nullptr}, - }; - EnumPropertyItem *item = nullptr; int totitem = 0; - /* Add predefined items. */ - RNA_enum_items_add(&item, &totitem, predefined_items); + if (include_local_library) { + const EnumPropertyItem predefined_items[] = { + /* For the future. */ + // {ASSET_REPO_BUNDLED, "BUNDLED", 0, "Bundled", "Show the default user assets"}, + {ASSET_LIBRARY_LOCAL, + "LOCAL", + ICON_BLENDER, + "Current File", + "Show the assets currently available in this Blender session"}, + {0, nullptr, 0, nullptr, nullptr}, + }; + + /* Add predefined items. */ + RNA_enum_items_add(&item, &totitem, predefined_items); + } /* Add separator if needed. */ if (!BLI_listbase_is_empty(&U.asset_libraries)) { |