archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Assets: enable node group assets

Browse Source 
This enables support for node group assets. Previously, node group
assets only worked when the "extended asset browser" experimental
features is enabled.

Differential Revision: https://developer.blender.org/D13748
This commit is contained in:
Jacques Lucke
2022-01-26 15:22:15 +01:00
parent 12b26d21b0
commit 37848d1c8e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/asset/ED_asset_type.h
View File

@@ -30,7 +30,7 @@ struct ID;
bool ED_asset_type_id_is_non_experimental(const struct ID *id); bool ED_asset_type_id_is_non_experimental(const struct ID *id);
#define ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_FLAGS \ #define ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_FLAGS \
(FILTER_ID_MA | FILTER_ID_OB | FILTER_ID_AC | FILTER_ID_WO) (FILTER_ID_MA | 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, * Check if the asset type for \a id (which doesn't need to be an asset right now) can be an asset,
@@ -52,7 +52,8 @@ int64_t ED_asset_types_supported_as_filter_flags(void);
* strings with this (not all UI code supports dynamic strings nicely). * 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"). * 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, or World" #define ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING \
"Material, Object, Pose Action, Node Group or World"
#ifdef __cplusplus #ifdef __cplusplus
} }

2
source/blender/editors/asset/intern/asset_type.cc
View File

@@ -30,7 +30,7 @@ bool ED_asset_type_id_is_non_experimental(const ID *id)
{ {
/* Remember to update #ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING and /* Remember to update #ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_UI_STRING and
* #ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_FLAGS() with this! */ * #ED_ASSET_TYPE_IDS_NON_EXPERIMENTAL_FLAGS() with this! */
return ELEM(GS(id->name), ID_MA, ID_OB, ID_AC, ID_WO); return ELEM(GS(id->name), ID_MA, ID_OB, ID_AC, ID_WO, ID_NT);
} }
bool ED_asset_type_is_supported(const ID *id) bool ED_asset_type_is_supported(const ID *id)