diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-02-19 20:00:16 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-02-19 20:00:34 +0300 |
| commit | a346a7dd109a58ec38bc35f44a4089e5b54f5044 (patch) | |
| tree | 2e53a2552cd29646ca1b91b44c7b3a4d3fcdc096 /source/blender/draw | |
| parent | 116cda65a2ca1c346c057739ee03ec6396b1af95 (diff) | |
GPencil: Don't show only lines in draw mode
As now is possible to use multiframe in Draw mode, the option to display only lines must be disabled.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_engine.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 5eaeeca8bab..8bb336ebc96 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -488,6 +488,7 @@ static void gpencil_stroke_cache_populate(bGPDlayer *gpl, { gpIterPopulateData *iter = (gpIterPopulateData *)thunk; + bGPdata *gpd = iter->ob->data; MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(iter->ob, gps->mat_nr + 1); const bool is_render = iter->pd->is_render; @@ -496,8 +497,8 @@ static void gpencil_stroke_cache_populate(bGPDlayer *gpl, (!is_render && ((gps->flag & GP_STROKE_NOFILL) != 0)); bool show_fill = (gps->tot_triangles > 0) && ((gp_style->flag & GP_MATERIAL_FILL_SHOW) != 0) && (!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 only_lines = !GPENCIL_PAINT_MODE(gpd) && gpl && gpf && gpl->actframe != gpf && + iter->pd->use_multiedit_lines_only; bool is_onion = gpl && gpf && gpf->runtime.onion_id != 0; bool hide_onion = is_onion && ((gp_style->flag & GP_MATERIAL_HIDE_ONIONSKIN) != 0); if ((hide_material) || (!show_stroke && !show_fill) || (only_lines && !is_onion) || |