[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32892] trunk/blender/source/blender/ modifiers/intern/MOD_array.c: Fix crash in several cases when adding bevel on array modifier with merging switched on

[Sergey Sharybin]

Revision: 32892
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32892
Author:   nazgul
Date:     2010-11-06 18:19:40 +0100 (Sat, 06 Nov 2010)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_array.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_array.c	2010-11-06 17:03:11 UTC (rev 32891)
+++ trunk/blender/source/blender/modifiers/intern/MOD_array.c	2010-11-06 17:19:40 UTC (rev 32892)
@@ -436,6 +436,10 @@
 			  {
 				  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];