blender
/
blender
136
406
Fork 590
Code Issues 6.3k Pull Requests 761 Projects 19 Wiki Activity

Fix #114657: Color attribute from applied GN modifier not active #114699

Closed
Philipp Oeser wants to merge 1 commits from lichtwerk/blender:114657 into main
pull from: lichtwerk/blender:114657
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 7 Commits 1 Files Changed 1 +11
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/object/object_modifier.cc
View File

@ -997,6 +997,17 @@ static bool modifier_apply_obdata(
/* Remove strings referring to attributes if they no longer exist. */
remove_invalid_attribute_strings(*me);
/* In case a geometry nodes modifier stored color attribute(s) [and none existed before],
* make the first one found active/default. */
CustomDataLayer *first_color_layer = BKE_id_attribute_from_index(
&me->id, 0, ATTR_DOMAIN_MASK_COLOR, CD_MASK_COLOR_ALL);
if (!me->active_color_attribute && first_color_layer != nullptr) {
me->active_color_attribute = BLI_strdup(first_color_layer->name);
}
if (!me->default_color_attribute && first_color_layer != nullptr) {
me->default_color_attribute = BLI_strdup(first_color_layer->name);
}
if (md_eval->type == eModifierType_Multires) {
multires_customdata_delete(me);
}