From ef192584239273801bb343cd284813a32f298d4b Mon Sep 17 00:00:00 2001 From: YimingWu Date: Wed, 10 Mar 2021 12:40:05 +0800 Subject: LineArt: use LRT_ITER_ALL_LINES_NEXT for iteration. --- source/blender/editors/lineart/lineart_chain.c | 2 +- source/blender/editors/lineart/lineart_intern.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/lineart/lineart_chain.c b/source/blender/editors/lineart/lineart_chain.c index 08297176e13..eca6a4c360c 100644 --- a/source/blender/editors/lineart/lineart_chain.c +++ b/source/blender/editors/lineart/lineart_chain.c @@ -202,8 +202,8 @@ void ED_lineart_chain_feature_lines(LineartRenderBuffer *rb) LRT_ITER_ALL_LINES_BEGIN { - if ((!(rl->flags & LRT_EDGE_FLAG_ALL_TYPE)) || (rl->flags & LRT_EDGE_FLAG_CHAIN_PICKED)) { + LRT_ITER_ALL_LINES_NEXT continue; } diff --git a/source/blender/editors/lineart/lineart_intern.h b/source/blender/editors/lineart/lineart_intern.h index dc9c51bba84..69c39d9ae6b 100644 --- a/source/blender/editors/lineart/lineart_intern.h +++ b/source/blender/editors/lineart/lineart_intern.h @@ -81,7 +81,7 @@ void lineart_count_and_print_render_buffer_memory(LineartRenderBuffer *rb); for (current_list = &rb->contours; rl; rl = next_rl) { \ next_rl = rl->next; -#define LRT_ITER_ALL_LINES_END \ +#define LRT_ITER_ALL_LINES_NEXT \ while (!next_rl) { \ if (current_list == &rb->contours) { \ current_list = &rb->crease_lines; \ @@ -99,7 +99,10 @@ void lineart_count_and_print_render_buffer_memory(LineartRenderBuffer *rb); break; \ } \ next_rl = *current_list; \ - } \ + } + +#define LRT_ITER_ALL_LINES_END \ + LRT_ITER_ALL_LINES_NEXT \ } #define LRT_BOUND_AREA_CROSSES(b1, b2) \ -- cgit v1.2.3