Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2010-11-06 20:19:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2010-11-06 20:19:40 +0300
commit5d1ea9e340d5a276ccf5e1f97fd0df536ba2a099 (patch)
tree99f156c599a828c8a4557a5207232f334607286d /source/blender/modifiers
parent5b0e1520cfc21fe4c9eafcb7c2d5416ca73ec7af (diff)
Fix crash in several cases when adding bevel on array modifier with merging switched on
Check if edge would be collapsed to single point after mapping in array modifier
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r--source/blender/modifiers/intern/MOD_array.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 9916afcfe55..2c672ed8e33 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -436,6 +436,10 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
{
vert1 = calc_mapping(indexMap, inMED.v1, j);
vert2 = calc_mapping(indexMap, inMED.v2, j);
+
+ /* edge could collapse to single point after mapping */
+ if(vert1 == vert2) continue;
+
/* avoid duplicate edges */
if(!BLI_edgehash_haskey(edges, vert1, vert2)) {
med2 = &medge[numEdges];