[Bf-blender-cvs] [94fb47e5725] master: Assets: Enable material and world assets by default

[Julian Eisel]

Commit: 94fb47e57251d662c6cdbcf460c2b52c75b34cb0
Author: Julian Eisel
Date:   Thu Oct 21 21:50:37 2021 +0200
Branches: master
https://developer.blender.org/rB94fb47e57251d662c6cdbcf460c2b52c75b34cb0

Assets: Enable material and world assets by default

Both material and world assets should be ready to use as non-experimental
feature. They were not enabled by default yet because the work from the
previous commit was needed first.
Objects should follow soon.

Maniphest Task: https://developer.blender.org/T91752

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

M	source/blender/editors/asset/ED_asset_type.h
M	source/blender/editors/asset/intern/asset_type.cc

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

diff --git a/source/blender/editors/asset/ED_asset_type.h b/source/blender/editors/asset/ED_asset_type.h
index ba0a3d2812f..1030be1ea05 100644
--- a/source/blender/editors/asset/ED_asset_type.h
+++ b/source/blender/editors/asset/ED_asset_type.h
@@ -48,7 +48,7 @@ int64_t ED_asset_types_supported_as_filter_flags(void);
  * strings with this (not all UI code supports dynamic strings nicely).
  * Should start with a consonant, so usages can prefix it with "a" (not "an").
  */
-#define ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING "Pose Action"
+#define ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING "Material, Pose Action, or World"
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/editors/asset/intern/asset_type.cc b/source/blender/editors/asset/intern/asset_type.cc
index 1b8e56974bf..5be627e3fbc 100644
--- a/source/blender/editors/asset/intern/asset_type.cc
+++ b/source/blender/editors/asset/intern/asset_type.cc
@@ -30,11 +30,11 @@ bool ED_asset_type_id_is_non_experimental(const ID *id)
 {
   /* Remember to update #ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING and
    * #asset_type_ids_non_experimental_as_filter_flags() with this! */
-  return ELEM(GS(id->name), ID_AC);
+  return ELEM(GS(id->name), ID_MA, ID_AC, ID_WO);
 }
 static int64_t asset_type_ids_non_experimental_as_filter_flags()
 {
-  return FILTER_ID_AC;
+  return FILTER_ID_MA | FILTER_ID_AC | FILTER_ID_WO;
 }
 
 bool ED_asset_type_is_supported(const ID *id)