[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45270] trunk/blender/source/blender: Small code cleanups related to arrays.
Nicholas Bishop
nicholasbishop at gmail.com
Fri Mar 30 01:13:57 CEST 2012
Revision: 45270
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45270
Author: nicholasbishop
Date: 2012-03-29 23:13:44 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
Small code cleanups related to arrays.
* Added helpful comment on 'keepverts' slot of bmop finddoubles.
* Removed unused macro 'E' from MOD_array.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-03-29 22:42:32 UTC (rev 45269)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-03-29 23:13:44 UTC (rev 45270)
@@ -224,6 +224,9 @@
*
* Takes input verts and find vertices they should weld to. Outputs a
* mapping slot suitable for use with the weld verts bmop.
+ *
+ * If keepverts is used, vertices outside that set can only be merged
+ * with vertices in that set.
*/
static BMOpDefine bmo_finddoubles_def = {
"finddoubles",
Modified: trunk/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_array.c 2012-03-29 22:42:32 UTC (rev 45269)
+++ trunk/blender/source/blender/modifiers/intern/MOD_array.c 2012-03-29 23:13:44 UTC (rev 45270)
@@ -374,12 +374,6 @@
}
#define _E(s, i) ((BMVert **)(s)->data.buf)[i]
- /* generate merge mapping using index map. we do this by using the
- * operator slots as lookup arrays.*/
- #define E(i) \
- ((i) < geom_slot->len ? \
- _E(geom_slot, i) : \
- _E(newout_slot, (i)-geom_slot->len))
for (i=0; i<indexLen; i++) {
if (!indexMap[i]) continue;
@@ -414,7 +408,6 @@
}
}
- #undef E
#undef _E
}
More information about the Bf-blender-cvs
mailing list