Merge branch 'master' into geometry-nodes-curve-support

1 files changed, 8 insertions, 2 deletions

diff --git a/source/blender/blenlib/BLI_iterator.h b/source/blender/blenlib/BLI_iterator.h
index c1cd1c21dac..198e42f340d 100644
--- a/source/blender/blenlib/BLI_iterator.h
+++ b/source/blender/blenlib/BLI_iterator.h
@@ -34,13 +34,19 @@ typedef struct BLI_Iterator {
 typedef void (*IteratorCb)(BLI_Iterator *iter);
 typedef void (*IteratorBeginCb)(BLI_Iterator *iter, void *data_in);
 
+#define BLI_ITERATOR_INIT(iter) \
+  { \
+    (iter)->skip = false; \
+    (iter)->valid = true; \
+  } \
+  ((void)0)
+
 #define ITER_BEGIN(callback_begin, callback_next, callback_end, _data_in, _type, _instance) \
   { \
     _type _instance; \
     IteratorCb callback_end_func = callback_end; \
     BLI_Iterator iter_macro; \
-    iter_macro.skip = false; \
-    iter_macro.valid = true; \
+    BLI_ITERATOR_INIT(&iter_macro); \
     for (callback_begin(&iter_macro, (_data_in)); iter_macro.valid; callback_next(&iter_macro)) { \
       if (iter_macro.skip) { \
         iter_macro.skip = false; \