diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-14 20:54:15 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-14 20:54:15 +0300 |
| commit | 4ac748c0993f2555abc879c630a0efe893909fe3 (patch) | |
| tree | fe1a34e2a94c3d775b11a201625e710ad2c71027 /source/blender/editors/gpencil | |
| parent | cc3d3a453e769a57399b1eae371d7bde9b67731c (diff) | |
| parent | 5f31e5031cb8c65a3379cb7c309268fc6cececf3 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_fill.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index dd7ad8d1767..d23a914fc49 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -295,18 +295,15 @@ static void gp_draw_datablock(tGPDfill *tgpf, const float ink[4]) tgpw.onion = true; tgpw.custonion = true; - bool textured_stroke = (gp_style->stroke_style == GP_MATERIAL_STROKE_STYLE_TEXTURE); - /* normal strokes */ - if (((tgpf->fill_draw_mode == GP_FILL_DMODE_STROKE) || - (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH)) && - !textured_stroke) { + if ((tgpf->fill_draw_mode == GP_FILL_DMODE_STROKE) || + (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH)) { ED_gp_draw_fill(&tgpw); } /* 3D Lines with basic shapes and invisible lines */ if ((tgpf->fill_draw_mode == GP_FILL_DMODE_CONTROL) || - (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH) || textured_stroke) { + (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH)) { gp_draw_basic_stroke(tgpf, gps, tgpw.diff_mat, |