[Bf-blender-cvs] [d317741149b] temp-lineart-contained: LineArt: use LRT_ITER_ALL_LINES_NEXT for iteration.

[YimingWu]

Commit: d317741149b70095a176c78f8daf6baa7c88a366
Author: YimingWu
Date:   Wed Mar 10 12:40:05 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBd317741149b70095a176c78f8daf6baa7c88a366

LineArt: use LRT_ITER_ALL_LINES_NEXT for iteration.

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

M	release/scripts/addons
M	source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
M	source/tools

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

diff --git a/release/scripts/addons b/release/scripts/addons
index ef3104dae30..67f1fbca148 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit ef3104dae302dcfb08b21e32d10b548bf304bd29
+Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 00b17bd9d89..171577016d3 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@ -200,8 +200,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/gpencil_modifiers/intern/lineart/lineart_intern.h b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
index 5b9b2f69c79..2cb5371e608 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
@@ -81,7 +81,7 @@ void lineart_count_and_print_render_buffer_memory(struct 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(struct 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) \
diff --git a/source/tools b/source/tools
index b66c22e1fb9..5cf2fc3e5dc 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit b66c22e1fb977bf8dd3797ebedc28fbe28f0305e
+Subproject commit 5cf2fc3e5dc28025394b57d8743401295528f310