[Bf-blender-cvs] [8c95ab235fa] master: GPencil: Fix unreported bug for fill closing strokes

[Antonio Vazquez]

Commit: 8c95ab235fad748ba6f18b04a6d5cd17df9f0108
Author: Antonio Vazquez
Date:   Wed Sep 28 17:38:23 2022 +0200
Branches: master
https://developer.blender.org/rB8c95ab235fad748ba6f18b04a6d5cd17df9f0108

GPencil: Fix unreported bug for fill closing strokes

The extend lines were included in render by error
when the only collide option was ON.

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

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 b99274d66e5..60665898ffe 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -874,22 +874,22 @@ static void gpencil_update_extend(tGPDfill *tgpf)
 
 static bool gpencil_stroke_is_drawable(tGPDfill *tgpf, bGPDstroke *gps)
 {
-  if (tgpf->is_render) {
-    return true;
-  }
-
   const bool show_help = (tgpf->flag & GP_BRUSH_FILL_SHOW_HELPLINES) != 0;
   const bool show_extend = (tgpf->flag & GP_BRUSH_FILL_SHOW_EXTENDLINES) != 0;
   const bool is_extend = (gps->flag & GP_STROKE_NOFILL) && (gps->flag & GP_STROKE_TAG);
   const bool is_extend_help = (gps->flag & GP_STROKE_NOFILL) && (gps->flag & GP_STROKE_HELP);
   const bool is_line_mode = (tgpf->fill_extend_mode == GP_FILL_EMODE_EXTEND);
   const bool only_collide = (tgpf->flag & GP_BRUSH_FILL_COLLIDE_ONLY) != 0;
-  const bool is_collide = (gps->flag & GP_STROKE_COLLIDE) != 0;
+  const bool stroke_collide = (gps->flag & GP_STROKE_COLLIDE) != 0;
 
-  if (is_line_mode && only_collide && tgpf->is_render && !is_collide) {
+  if (is_extend && is_line_mode && only_collide && tgpf->is_render && !stroke_collide) {
     return false;
   }
 
+  if (tgpf->is_render) {
+    return true;
+  }
+
   if ((!show_help) && (show_extend)) {
     if (!is_extend && !is_extend_help) {
       return false;