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

GPencil: Fix unreported missing material onion filter 

This feature was removed by error during the refactor done in draw engine.

Differential Revision: https://developer.blender.org/D8082
This commit is contained in:
Antonio Vazquez 2020-06-21 15:51:50 +02:00
parent 91117cad0f
commit 3fc5826f7c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

@ -493,8 +493,10 @@ static void gpencil_stroke_cache_populate(bGPDlayer *gpl,
(!iter->pd->simplify_fill) && ((gps->flag & GP_STROKE_NOFILL) == 0);
bool only_lines = gpl && gpf && gpl->actframe != gpf && iter->pd->use_multiedit_lines_only;
bool hide_onion = gpl && gpf && gpf->runtime.onion_id != 0 &&
((gp_style->flag & GP_MATERIAL_HIDE_ONIONSKIN) != 0);
if (hide_material || (!show_stroke && !show_fill) || only_lines) {
if (hide_material || (!show_stroke && !show_fill) || only_lines || hide_onion) {
return;
}

2
source/blender/editors/gpencil/drawgpencil.c
View File

@ -316,7 +316,7 @@ static void gp_draw_strokes(tGPDdraw *tgpw)
if ((gp_style == NULL) || (gp_style->flag & GP_MATERIAL_HIDE) ||
/* if onion and ghost flag do not draw*/
(tgpw->onion && (gp_style->flag & GP_MATERIAL_ONIONSKIN))) {
(tgpw->onion && (gp_style->flag & GP_MATERIAL_HIDE_ONIONSKIN))) {
continue;
}

2
source/blender/makesdna/DNA_material_types.h
View File

@ -112,7 +112,7 @@ typedef enum eMaterialGPencilStyle_Flag {
/* protected from further editing */
GP_MATERIAL_LOCKED = (1 << 2),
/* do onion skinning */
GP_MATERIAL_ONIONSKIN = (1 << 3),
GP_MATERIAL_HIDE_ONIONSKIN = (1 << 3),
/* clamp texture */
GP_MATERIAL_TEX_CLAMP = (1 << 4),
/* mix fill texture */

2
source/blender/makesrna/intern/rna_material.c
View File

@ -542,7 +542,7 @@ static void rna_def_material_greasepencil(BlenderRNA *brna)
RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_MaterialGpencil_update");
prop = RNA_def_property(srna, "ghost", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MATERIAL_ONIONSKIN);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MATERIAL_HIDE_ONIONSKIN);
RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
RNA_def_property_ui_text(
prop, "Show in Ghosts", "Display strokes using this color when showing onion skins");