archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Cleanup: Rename variables

Browse Source
This commit is contained in:
Antonio Vazquez
2022-09-28 17:41:08 +02:00
parent 8c95ab235f
commit 2312915b96
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/gpencil/gpencil_fill.c
View File

@@ -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;
}
}