diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-09 07:45:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-09 07:45:53 +0300 |
| commit | 08841476983f490c4dbf16934bc05602bbd4d5c5 (patch) | |
| tree | c38dee93dc2bfb6b05ba1cbb4a19916e271e8a5e /source/blender/modifiers | |
| parent | f6733d90e57fe8dce473f05b4bf0b4e6d4559ecd (diff) | |
fix [#25968] Crash on changing merge distance in array modifier with edgesplit modifier in chain
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 1fdfe6c192c..9b49066d623 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -546,12 +546,10 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, if (inMF.v4) mf2->v4 = calc_mapping(indexMap, inMF.v4, j); - test_index_face_maxvert(mf2, &result->faceData, numFaces, inMF.v4?4:3, numVerts); numFaces++; /* if the face has fewer than 3 vertices, don't create it */ - if(mf2->v3 == 0 || (mf2->v1 && (mf2->v1 == mf2->v3 || mf2->v1 == - mf2->v4))) { + if(test_index_face_maxvert(mf2, &result->faceData, numFaces-1, inMF.v4?4:3, numVerts) < 3) { numFaces--; DM_free_face_data(result, numFaces, 1); } |