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

GPencil: Fix unreported bug for fill closing strokes

Browse Source 
The extend lines were included in render by error
when the only collide option was ON.
This commit is contained in:
Antonio Vazquez
2022-09-28 17:38:23 +02:00
parent 1f493125e3
commit 8c95ab235f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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