archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Patch #4751 - Array modifier merge segfault fix.

Browse Source
This commit is contained in:
Ben Batt
2006-08-13 15:23:57 +00:00
parent 879fa3cb4e
commit 404ccd1a07
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/modifier.c
View File

@@ -649,7 +649,12 @@ static int calc_mapping(IndexMapEntry *indexMap, int oldVert, int copy)
/* vert was merged with another vert */
int mergeVert = indexMap[oldVert].merge;
if (mergeVert == indexMap[mergeVert].merge)
/* follow the chain of merges to the end */
while(indexMap[mergeVert].merge >= 0
&& indexMap[mergeVert].merge != mergeVert)
mergeVert = indexMap[mergeVert].merge;
if(indexMap[mergeVert].merge == mergeVert)
/* vert merged with vert that was merged with itself */
newVert = indexMap[mergeVert].new;
else