[Bf-blender-cvs] [5f31e5031cb] blender-v2.83-release: GPencil: Fix unreported problem filling textured strokes

[Antonio Vazquez]

Commit: 5f31e5031cb8c65a3379cb7c309268fc6cececf3
Author: Antonio Vazquez
Date:   Thu May 14 19:53:46 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB5f31e5031cb8c65a3379cb7c309268fc6cececf3

GPencil: Fix unreported problem filling textured strokes

The internal image used for filling was not correct when the texture was used in stroke and this makes impossible get a right filling.

===================================================================

M	source/blender/editors/gpencil/gpencil_fill.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index c24f7150cbb..7e753726564 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,