[Bf-blender-cvs] [868bde59202] blender-v2.79a-release: BLI_utildefines_iter: Use for iteration helpers

Campbell Barton noreply at git.blender.org
Fri Jan 5 00:42:28 CET 2018


Commit: 868bde59202fbb04d4050c8804c287f71586ca80
Author: Campbell Barton
Date:   Tue Sep 19 20:21:52 2017 +1000
Branches: blender-v2.79a-release
https://developer.blender.org/rB868bde59202fbb04d4050c8804c287f71586ca80

BLI_utildefines_iter: Use for iteration helpers

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

A	source/blender/blenlib/BLI_utildefines_iter.h
M	source/blender/bmesh/intern/bmesh_edgeloop.c

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

diff --git a/source/blender/blenlib/BLI_utildefines_iter.h b/source/blender/blenlib/BLI_utildefines_iter.h
new file mode 100644
index 00000000000..094c1a4b3dc
--- /dev/null
+++ b/source/blender/blenlib/BLI_utildefines_iter.h
@@ -0,0 +1,52 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BLI_UTILDEFINES_ITER_H__
+#define __BLI_UTILDEFINES_ITER_H__
+
+/** \file BLI_utildefines_iter.h
+ *  \ingroup bli
+ *
+ * General looping helpers, use `BLI_FOREACH` prefix.
+ */
+
+/**
+ * Even value distribution.
+ *
+ * \a src must be larger than \a dst,
+ * \a dst defines the number of iterations, their values are evenly spaced.
+ *
+ * The following pairs represent (src, dst) arguments and the values they loop over.
+ * <pre>
+ * (19, 4) ->    [2, 7, 11. 16]
+ * (100, 5) ->   [9, 29, 49, 69, 89]
+ * (100, 3) ->   [16, 49, 83]
+ * (100, 100) -> [0..99]
+ * </pre>
+ * \note this is mainly useful for numbers that might not divide evenly into eachother.
+ */
+#define BLI_FOREACH_SPARSE_RANGE(src, dst, i) \
+for (int _src = (src), _src2 = _src * 2, _dst2 = (dst) * 2, _error = _dst2 - _src, i = 0, _delta; \
+     ((void)(_delta = divide_floor_i(_error, _dst2)), \
+      (void)(i -= _delta), \
+      (i < _src)); \
+     _error -= (_delta * _dst2) + _src2)
+
+#endif  /* __BLI_UTILDEFINES_ITER_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c
index 97840df3a5d..b3b23933d2f 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.c
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.c
@@ -32,6 +32,7 @@
 #include "BLI_math_vector.h"
 #include "BLI_listbase.h"
 #include "BLI_mempool.h"
+#include "BLI_utildefines_iter.h"
 
 #include "bmesh.h"
 
@@ -707,29 +708,6 @@ void BM_edgeloop_expand(
 		split_swap = !split_swap;
 	}
 
-	/* TODO, move to generic define? */
-	/**
-	 * Even value distribution.
-	 *
-	 * \a src must be larger than \a dst,
-	 * \a dst defines the number of iterations, their values are evenly spaced.
-	 *
-	 * The following pairs represent (src, dst) arguments and the values they loop over.
-	 * <pre>
-	 * (19, 4) ->    [2, 7, 11. 16]
-	 * (100, 5) ->   [9, 29, 49, 69, 89]
-	 * (100, 3) ->   [16, 49, 83]
-	 * (100, 100) -> [0..99]
-	 * </pre>
-	 * \note this is mainly useful for numbers that might not divide evenly into eachother.
-	 */
-#define BLI_FOREACH_SPARSE_RANGE(src, dst, i) \
-	for (int _src = (src), _src2 = _src * 2, _dst2 = (dst) * 2, _error = _dst2 - _src, i = 0, _delta; \
-	     ((void)(_delta = divide_floor_i(_error, _dst2)), \
-	      (void)(i -= _delta), \
-	      (i < _src)); \
-	     _error -= (_delta * _dst2) + _src2)
-
 	if (el_store->len < el_store_len) {
 		LinkData *node_curr = el_store->verts.first;



More information about the Bf-blender-cvs mailing list