tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Bugfix #24999 

Array Modifier: edge indices could be equal to numVerts, causing 
bad crashes in derivedmesh. Similar fix to previous here with
face indices. Should poke the coder of this... for now it survives OK.
This commit is contained in:
Ton Roosendaal 2010-12-01 17:47:38 +00:00
parent f4205498a9
commit 3e214bd72c
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/modifiers/intern/MOD_array.c
View File

@ -443,7 +443,13 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
}
if(med.v1 == med.v2) continue;
/* XXX Unfortunately the calc_mapping returns sometimes numVerts... leads to bad crashes */
if(med.v1 >= numVerts)
med.v1= numVerts-1;
if(med.v2 >= numVerts)
med.v2= numVerts-1;
if (initFlags) {
med.flag |= ME_EDGEDRAW | ME_EDGERENDER;
}
@ -460,9 +466,15 @@ 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;
/* XXX Unfortunately the calc_mapping returns sometimes numVerts... leads to bad crashes */
if(vert1 >= numVerts)
vert1= numVerts-1;
if(vert2 >= numVerts)
vert2= numVerts-1;
/* avoid duplicate edges */
if(!BLI_edgehash_haskey(edges, vert1, vert2)) {