[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36584] branches/bmesh/blender/source/ blender/bmesh/intern/bmesh_newcore.c: =bmesh= fixed dissolve verts crash

[Joseph Eagar]

Revision: 36584
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36584
Author:   joeedh
Date:     2011-05-09 21:55:15 +0000 (Mon, 09 May 2011)
Log Message:
-----------
=bmesh= fixed dissolve verts crash

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2011-05-09 21:45:01 UTC (rev 36583)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c	2011-05-09 21:55:15 UTC (rev 36584)
@@ -931,8 +931,9 @@
 
 	/*create region face*/
 	newf = BM_Make_Ngon(bm, v1, v2, edges, tote, 0);
-	if (!newf) {
-		err = "Invalid boundary region to join faces";
+	if (!newf || BMO_HasError(bm)) {
+		if (!BMO_HasError(bm)) 
+			err = "Invalid boundary region to join faces";
 		goto error;
 	}
 
@@ -965,7 +966,7 @@
 
 		l = l->next;
 	} while (l != bm_firstfaceloop(newf));
-
+	
 	BM_Copy_Attributes(bm, bm, faces[0], newf);
 
 	/*add holes*/