[Bf-blender-cvs] [b7774272344] greasepencil-object: GPencil: Cleanup loops and replace by macros

[Antonio Vazquez]

Commit: b7774272344fca26084836d65f30691bbf8e1893
Author: Antonio Vazquez
Date:   Tue Feb 25 18:00:12 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb7774272344fca26084836d65f30691bbf8e1893

GPencil: Cleanup loops and replace by macros

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/editors/gpencil/gpencil_interpolate.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 9e02a71ad47..13363c120de 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -146,12 +146,10 @@ void BKE_gpencil_free_stroke(bGPDstroke *gps)
 /* Free strokes belonging to a gp-frame */
 bool BKE_gpencil_free_strokes(bGPDframe *gpf)
 {
-  bGPDstroke *gps_next;
   bool changed = (BLI_listbase_is_empty(&gpf->strokes) == false);
 
   /* free strokes */
-  for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps_next) {
-    gps_next = gps->next;
+  LISTBASE_FOREACH_MUTABLE (bGPDstroke *, gps, &gpf->strokes) {
     BKE_gpencil_free_stroke(gps);
   }
   BLI_listbase_clear(&gpf->strokes);
diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c
index 05d5b8d6eee..184d50d3cde 100644
--- a/source/blender/editors/gpencil/gpencil_interpolate.c
+++ b/source/blender/editors/gpencil/gpencil_interpolate.c
@@ -126,9 +126,7 @@ static void gp_interpolate_free_temp_strokes(bGPDframe *gpf)
     return;
   }
 
-  bGPDstroke *gps_next;
-  for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps_next) {
-    gps_next = gps->next;
+  LISTBASE_FOREACH_MUTABLE (bGPDstroke *, gps, &gpf->strokes) {
     if (gps->flag & GP_STROKE_TAG) {
       BLI_remlink(&gpf->strokes, gps);
       BKE_gpencil_free_stroke(gps);