diff options
author | Jeroen Bakker <jeroen@blender.org> | 2022-01-18 13:20:50 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-01-18 13:20:50 +0300 |
commit | fce0b824a767331f1d018e98f5400d376364591f (patch) | |
tree | 88e3c002207e0414048949ca3e337a844f258667 /source | |
parent | 36068487d076bfd8320d9d6b05b69a6a8966c78b (diff) |
Assets: Enabling Asset Indexing.
Asset indexing was disabled as ID property indexing wasn't supported.
Now that ID property support is added we can enable asset indexing.
Check {T91406} for more information about asset indexing.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/asset/intern/asset_list.cc | 6 | ||||
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/editors/asset/intern/asset_list.cc b/source/blender/editors/asset/intern/asset_list.cc index 1bfdd83b8e3..c075ae390d9 100644 --- a/source/blender/editors/asset/intern/asset_list.cc +++ b/source/blender/editors/asset/intern/asset_list.cc @@ -49,10 +49,6 @@ #include "ED_asset_list.hh" #include "asset_library_reference.hh" -/* Enable asset indexing. Currently disabled as ID properties aren't indexed yet and is needed for - * object snapping. See {D12990}. */ -//#define SPACE_FILE_ENABLE_ASSET_INDEXING - namespace blender::ed::asset { /* -------------------------------------------------------------------- */ @@ -174,9 +170,7 @@ void AssetList::setup() "", ""); -#ifdef SPACE_FILE_ENABLE_ASSET_INDEXING filelist_setindexer(files, &file_indexer_asset); -#endif char path[FILE_MAXDIR] = ""; if (user_library) { diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index bbf3c6f768c..ea336d0b65c 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -61,10 +61,6 @@ #include "filelist.h" #include "fsmenu.h" -/* Enable asset indexing. Currently disabled as ID properties aren't indexed yet and is needed for - * object snapping. See {D12990}. */ -//#define SPACE_FILE_ENABLE_ASSET_INDEXING - static ARegion *file_ui_region_ensure(ScrArea *area, ARegion *region_prev) { ARegion *region; @@ -359,11 +355,9 @@ static void file_refresh(const bContext *C, ScrArea *area) sfile->files, asset_params->asset_catalog_visibility, &asset_params->catalog_id); } -#ifdef SPACE_FILE_ENABLE_ASSET_INDEXING if (ED_fileselect_is_asset_browser(sfile)) { filelist_setindexer(sfile->files, &file_indexer_asset); } -#endif /* Update the active indices of bookmarks & co. */ sfile->systemnr = fsmenu_get_active_indices(fsmenu, FS_CATEGORY_SYSTEM, params->dir); |