Small code cleanups related to arrays.
authorNicholas Bishop <nicholasbishop@gmail.com>
Thu, 29 Mar 2012 23:13:44 +0000 (23:13 +0000)
committerNicholas Bishop <nicholasbishop@gmail.com>
Thu, 29 Mar 2012 23:13:44 +0000 (23:13 +0000)
* Added helpful comment on 'keepverts' slot of bmop finddoubles.
* Removed unused macro 'E' from MOD_array.

source/blender/bmesh/intern/bmesh_opdefines.c
source/blender/modifiers/intern/MOD_array.c

index 086aea63d504e265ca0f33185c2f41093e1d2980..34a1a3e7511ace6cc41b7451c2360b456eb0d666 100644 (file)
@@ -224,6 +224,9 @@ static BMOpDefine bmo_mirror_def = {
  *
  * 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",
index 4f102e8ad67a1f64119107155e488f39f694434e..ceae07f1f4392365b093bad1e1f936c3026b822d 100644 (file)
@@ -374,12 +374,6 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
                        }
 
                        #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 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
                                }
                        }
 
-                       #undef E
                        #undef _E
                }