diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 09:59:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-13 09:59:14 +0400 |
commit | 7d18115e14c2ae17de8399440a8c034bca5efa45 (patch) | |
tree | c959bb99387ce553b3d5720a90989e88f25405a2 /source/blender/modifiers | |
parent | 68a97d168ddf3e9b3b83c6fd9374cccee6f60e0e (diff) |
own error - mixup with BMO_slot_mat_get/set
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 46 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 2 |
2 files changed, 3 insertions, 45 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index a711650676b..0f25fdbe88b 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -162,48 +162,6 @@ static float vertarray_size(MVert *mvert, int numVerts, int axis) return max_co - min_co; } -typedef struct IndexMapEntry { - /* the new vert index that this old vert index maps to */ - int new; - /* -1 if this vert isn't merged, otherwise the old vert index it - * should be replaced with - */ - int merge; - /* 1 if this vert's first copy is merged with the last copy of its - * merge target, otherwise 0 - */ - short merge_final; -} IndexMapEntry; - -#if 0 /* BMESH_TODO, keep this function??? */ - -/* indexMap - an array of IndexMap entries - * oldIndex - the old index to map - * copyNum - the copy number to map to (original = 0, first copy = 1, etc.) - */ -static int calc_mapping(IndexMapEntry *indexMap, int oldIndex, int copyNum) -{ - if(indexMap[oldIndex].merge < 0) { - /* vert wasn't merged, so use copy of this vert */ - return indexMap[oldIndex].new + copyNum; - } else if(indexMap[oldIndex].merge == oldIndex) { - /* vert was merged with itself */ - return indexMap[oldIndex].new; - } else { - /* vert was merged with another vert */ - /* follow the chain of merges to the end, or until we've passed - * a number of vertices equal to the copy number - */ - if(copyNum <= 0) - return indexMap[oldIndex].new; - else - return calc_mapping(indexMap, indexMap[oldIndex].merge, - copyNum - 1); - } -} - -#endif - static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, Scene *scene, Object *ob, DerivedMesh *dm, int UNUSED(initFlags)) @@ -325,8 +283,8 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, BMHeader *h; BMO_op_initf(em->bm, &findop, - "finddoubles verts=%av dist=%f keepverts=%s", - amd->merge_dist, &op, "geom"); + "finddoubles verts=%av dist=%f keepverts=%s", + amd->merge_dist, &op, "geom"); i = 0; BMO_ITER(h, &oiter, em->bm, &op, "geom", BM_ALL) { diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 789244c6e88..91ff1ad0063 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -145,7 +145,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, } BMO_op_callf(bm, "bevel geom=%fe percent=%f use_even=%i use_dist=%i", - EDGE_MARK, bmd->value, (bmd->flags & BME_BEVEL_EVEN)!=0, (bmd->flags & BME_BEVEL_DIST)!=0); + EDGE_MARK, bmd->value, (bmd->flags & BME_BEVEL_EVEN)!=0, (bmd->flags & BME_BEVEL_DIST) != 0); BMO_pop(bm); BLI_assert(em->looptris == NULL); |