[Bf-blender-cvs] [253e4e7ed22] master: Assets: Enable collection assets (no longer experimental)

[Julian Eisel]

Commit: 253e4e7ed22b37cf3e5a5b9e19f6b6e000b04a91
Author: Julian Eisel
Date:   Fri Apr 1 16:47:45 2022 +0200
Branches: master
https://developer.blender.org/rB253e4e7ed22b37cf3e5a5b9e19f6b6e000b04a91

Assets: Enable collection assets (no longer experimental)

With automatic collection previews (810e225c260d) and a toggle for
collection instancing (previous commit) supported, there are no known
blocking issues for collection assets. There are still further
improvements to come as part of regular developemt (e.g. bounding box
based snapping).

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

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 88511490b5c..f0cddbdf070 100644
--- a/source/blender/editors/asset/ED_asset_type.h
+++ b/source/blender/editors/asset/ED_asset_type.h
@@ -16,7 +16,7 @@ struct ID;
 
 bool ED_asset_type_id_is_non_experimental(const struct ID *id);
 #define ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_FLAGS \
-  (FILTER_ID_MA | FILTER_ID_OB | FILTER_ID_AC | FILTER_ID_WO | FILTER_ID_NT)
+  (FILTER_ID_MA | FILTER_ID_GR | FILTER_ID_OB | FILTER_ID_AC | FILTER_ID_WO | FILTER_ID_NT)
 
 /**
  * Check if the asset type for \a id (which doesn't need to be an asset right now) can be an asset,
@@ -39,7 +39,7 @@ int64_t ED_asset_types_supported_as_filter_flags(void);
  * Should start with a consonant, so usages can prefix it with "a" (not "an").
  */
 #define ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING \
-  "Material, Object, Pose Action, Node Group or World"
+  "Material, Collection, Object, Pose Action, Node Group 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 2c219f3dce2..3ecf7df068f 100644
--- a/source/blender/editors/asset/intern/asset_type.cc
+++ b/source/blender/editors/asset/intern/asset_type.cc
@@ -16,7 +16,7 @@ bool ED_asset_type_id_is_non_experimental(const ID *id)
 {
   /* Remember to update #ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING and
    * #ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_FLAGS() with this! */
-  return ELEM(GS(id->name), ID_MA, ID_OB, ID_AC, ID_WO, ID_NT);
+  return ELEM(GS(id->name), ID_MA, ID_GR, ID_OB, ID_AC, ID_WO, ID_NT);
 }
 
 bool ED_asset_type_is_supported(const ID *id)