diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-09-28 18:41:08 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-09-28 18:42:32 +0300 |
| commit | 2312915b9620808d29e9b20529684800638d5a2a (patch) | |
| tree | f1f4911c214491d18de0f8c064965db3694f0dcf | |
| parent | 8c95ab235fad748ba6f18b04a6d5cd17df9f0108 (diff) | |
Cleanup: Rename variables
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_fill.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index 60665898ffe..c99d003faf3 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -874,15 +874,16 @@ static void gpencil_update_extend(tGPDfill *tgpf) static bool gpencil_stroke_is_drawable(tGPDfill *tgpf, bGPDstroke *gps) { + const bool is_line_mode = (tgpf->fill_extend_mode == GP_FILL_EMODE_EXTEND); 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_extend_stroke = (gps->flag & GP_STROKE_NOFILL) && (gps->flag & GP_STROKE_TAG); + const bool is_help_stroke = (gps->flag & GP_STROKE_NOFILL) && (gps->flag & GP_STROKE_HELP); + const bool only_collide_strokes = (tgpf->flag & GP_BRUSH_FILL_COLLIDE_ONLY) != 0; const bool stroke_collide = (gps->flag & GP_STROKE_COLLIDE) != 0; - if (is_extend && is_line_mode && only_collide && tgpf->is_render && !stroke_collide) { + if (is_line_mode && is_extend_stroke && only_collide_strokes && tgpf->is_render && + !stroke_collide) { return false; } @@ -891,13 +892,13 @@ static bool gpencil_stroke_is_drawable(tGPDfill *tgpf, bGPDstroke *gps) } if ((!show_help) && (show_extend)) { - if (!is_extend && !is_extend_help) { + if (!is_extend_stroke && !is_help_stroke) { return false; } } if ((show_help) && (!show_extend)) { - if (is_extend || is_extend_help) { + if (is_extend_stroke || is_help_stroke) { return false; } } |