blender
/
blender
134
398
Fork 579
Code Issues 6.3k Pull Requests 750 Projects 19 Wiki Activity

Assets: Implement Traits #105841

Open
Harley Acheson wants to merge 2 commits from Harley/blender:AssetTraits into main
pull from: Harley/blender:AssetTraits
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 17 Commits 2 Files Changed 6 +6 -4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cdc2eea37e - Show all commits

10
source/blender/blenkernel/intern/asset.cc
View File

@ -86,7 +86,7 @@ AssetMetaData::~AssetMetaData()
static AssetTag *asset_metadata_tag_add(AssetMetaData *asset_data, const char *const name)
{
AssetTag *tag = (AssetTag *)MEM_callocN(sizeof(*tag), __func__);
AssetTag *tag = MEM_cnew<AssetTag>(__func__);
STRNCPY(tag->name, name);
BLI_addtail(&asset_data->tags, tag);
@ -111,7 +111,8 @@ AssetTagEnsureResult BKE_asset_metadata_tag_ensure(AssetMetaData *asset_data, co
return result;
}
AssetTag *tag = (AssetTag *)BLI_findstring(&asset_data->tags, name, offsetof(AssetTag, name));
AssetTag *tag = static_cast<AssetTag *>(
BLI_findstring(&asset_data->tags, name, offsetof(AssetTag, name)));
if (tag) {
result.tag = tag;
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-03-17 15:13:31 +01:00
Outdated
Review
Copy Link

Can be removed. I'd for traits we just want to ensure a specific trait is set, we never want the name to be changed (like no automatic .001 suffix). So _ensure() is all we need.

Can be removed. I'd for traits we just want to ensure a specific trait is set, we never want the name to be changed (like no automatic `.001` suffix). So `_ensure()` is all we need.
@ -137,7 +138,7 @@ void BKE_asset_metadata_tag_remove(AssetMetaData *asset_data, AssetTag *tag)
static AssetTrait *asset_metadata_trait_add(AssetMetaData *asset_data, const char *const value)
{
Harley marked this conversation as resolved
Hans Goudey commented 2023-07-10 13:50:21 +02:00
Review
Copy Link

MEM_cnew<AssetTrait>(__func__) is simpler in C++ code

`MEM_cnew<AssetTrait>(__func__)` is simpler in C++ code
AssetTrait *trait = (AssetTrait *)MEM_callocN(sizeof(*trait), __func__);
AssetTrait *trait = MEM_cnew<AssetTrait>(__func__);
BLI_strncpy(trait->value, value, sizeof(trait->value));
BLI_addtail(&asset_data->traits, trait);
return trait;
@ -151,7 +152,8 @@ struct AssetTraitEnsureResult BKE_asset_metadata_trait_ensure(AssetMetaData *ass
return result;
}
Harley marked this conversation as resolved
Hans Goudey commented 2023-07-10 13:50:55 +02:00
Review
Copy Link

static_cast<AssetTrait *> (https://wiki.blender.org/wiki/Style_Guide/C_Cpp#C.2B.2B_Type_Cast)

`static_cast<AssetTrait *>` (https://wiki.blender.org/wiki/Style_Guide/C_Cpp#C.2B.2B_Type_Cast)
AssetTrait *trait = (AssetTrait *)BLI_findstring(&asset_data->traits, value, offsetof(AssetTrait, value));
AssetTrait *trait = static_cast<AssetTrait *>(
BLI_findstring(&asset_data->traits, value, offsetof(AssetTrait, value)));
if (trait) {
result.trait = trait;