[Bf-blender-cvs] [b3bb51dd83a] master: Fix asset-view template ignoring "Asset Indexing" debug option

[Julian Eisel]

Commit: b3bb51dd83a3a17f6fada77f6bed26758070f7ad
Author: Julian Eisel
Date:   Mon Feb 7 12:18:15 2022 +0100
Branches: master
https://developer.blender.org/rBb3bb51dd83a3a17f6fada77f6bed26758070f7ad

Fix asset-view template ignoring "Asset Indexing" debug option

If the "Asset Indexing" option was disabled in Preferences > Experimental
> Debugging, the asset-view template (used by pose libraries for
example) would still use the indexing.

===================================================================

M	source/blender/editors/asset/intern/asset_list.cc

===================================================================

diff --git a/source/blender/editors/asset/intern/asset_list.cc b/source/blender/editors/asset/intern/asset_list.cc
index c075ae390d9..fa0946ffe3d 100644
--- a/source/blender/editors/asset/intern/asset_list.cc
+++ b/source/blender/editors/asset/intern/asset_list.cc
@@ -41,6 +41,7 @@
 #include "WM_api.h"
 
 /* XXX uses private header of file-space. */
+#include "../space_file/file_indexer.h"
 #include "../space_file/filelist.h"
 
 #include "ED_asset_handle.h"
@@ -170,7 +171,8 @@ void AssetList::setup()
       "",
       "");
 
-  filelist_setindexer(files, &file_indexer_asset);
+  const bool use_asset_indexer = !USER_EXPERIMENTAL_TEST(&U, no_asset_indexing);
+  filelist_setindexer(files, use_asset_indexer ? &file_indexer_asset : &file_indexer_noop);
 
   char path[FILE_MAXDIR] = "";
   if (user_library) {