diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-30 03:13:44 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-30 03:13:44 +0400 |
commit | 9c5907cc79126c96a82356d16960838d47671c83 (patch) | |
tree | ccd0fd56ec65337458fe45f4dfe1b9ec2799b8ca | |
parent | 8ec4371ff1d2e36970b0823e4b6f4a7edc25d89e (diff) |
Small code cleanups related to arrays.
* Added helpful comment on 'keepverts' slot of bmop finddoubles.
* Removed unused macro 'E' from MOD_array.
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 3 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 086aea63d50..34a1a3e7511 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -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", diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 4f102e8ad67..ceae07f1f43 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -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 } |