blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T56266: Second try to fix material problems

This commit is contained in:
Antonio Vazquez 2018-08-07 22:13:02 +02:00
parent 95e490889d
commit 3884b86927
Notes: blender-bot 2024-03-25 12:30:38 +01:00 
Referenced by issue #56266, Grease Pencil Tint modifiers not working as expected when apply
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
View File

@ -135,8 +135,8 @@ static void bakeModifier(
assign_material(bmain, ob, newmat, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
copy_v3_v3(newmat->gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v3_v3(newmat->gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
copy_v4_v4(newmat->gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v4_v4(newmat->gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
BLI_ghash_insert(gh_color, mat->id.name, newmat);
DEG_id_tag_update(&newmat->id, DEG_TAG_COPY_ON_WRITE);
@ -146,9 +146,18 @@ static void bakeModifier(
gps->mat_nr = idx - 1;
}
else {
/* reuse existing color */
copy_v3_v3(gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v3_v3(gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
/* reuse existing color (but update only first time) */
if (BLI_ghash_lookup(gh_color, mat->id.name) == NULL) {
copy_v4_v4(gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v4_v4(gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
BLI_ghash_insert(gh_color, mat->id.name, mat);
}
/* update previews (icon and thumbnail) */
if (mat->preview != NULL) {
mat->preview->flag[ICON_SIZE_ICON] |= PRV_CHANGED;
mat->preview->flag[ICON_SIZE_PREVIEW] |= PRV_CHANGED;
}
DEG_id_tag_update(&mat->id, DEG_TAG_COPY_ON_WRITE);
}
}

19
source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
View File

@ -143,8 +143,8 @@ static void bakeModifier(
assign_material(bmain, ob, newmat, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
copy_v3_v3(newmat->gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v3_v3(newmat->gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
copy_v4_v4(newmat->gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v4_v4(newmat->gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
BLI_ghash_insert(gh_color, mat->id.name, newmat);
DEG_id_tag_update(&newmat->id, DEG_TAG_COPY_ON_WRITE);
@ -154,9 +154,18 @@ static void bakeModifier(
gps->mat_nr = idx - 1;
}
else {
/* reuse existing color */
copy_v3_v3(gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v3_v3(gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
/* reuse existing color (but update only first time) */
if (BLI_ghash_lookup(gh_color, mat->id.name) == NULL) {
copy_v4_v4(gp_style->stroke_rgba, gps->runtime.tmp_stroke_rgba);
copy_v4_v4(gp_style->fill_rgba, gps->runtime.tmp_fill_rgba);
BLI_ghash_insert(gh_color, mat->id.name, mat);
}
/* update previews (icon and thumbnail) */
if (mat->preview != NULL) {
mat->preview->flag[ICON_SIZE_ICON] |= PRV_CHANGED;
mat->preview->flag[ICON_SIZE_PREVIEW] |= PRV_CHANGED;
}
DEG_id_tag_update(&mat->id, DEG_TAG_COPY_ON_WRITE);
}
}
}