blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

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
This commit is contained in:
Julian Eisel 2021-10-21 21:50:37 +02:00
parent a286148799
commit 94fb47e572
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
}

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

@ -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)