[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52687] trunk/blender/source: fix for another error in my own recent commit, beauty fill crashed.

[Campbell Barton]

Revision: 52687
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52687
Author:   campbellbarton
Date:     2012-11-30 16:15:49 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
fix for another error in my own recent commit, beauty fill crashed.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_core.c
    trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
    trunk/blender/source/tests/bl_run_operators.py

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2012-11-30 16:03:34 UTC (rev 52686)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2012-11-30 16:15:49 UTC (rev 52687)
@@ -1049,7 +1049,7 @@
 	}
 
 	/* create region face */
-	newf = BM_face_create_ngon(bm, v1, v2, edges, tote, 0);
+	newf = tote ? BM_face_create_ngon(bm, v1, v2, edges, tote, 0) : NULL;
 	if (UNLIKELY(!newf || BMO_error_occurred(bm))) {
 		if (!BMO_error_occurred(bm))
 			err = N_("Invalid boundary region to join faces");
@@ -1239,7 +1239,7 @@
 	}
 
 	/* allocate new edge between v1 and v2 */
-	e = BM_edge_create(bm, v1, v2, example, nodouble);
+	e = BM_edge_create(bm, v1, v2, example, nodouble ? BM_CREATE_NO_DOUBLE : 0);
 
 	f2 = bm_face_create__sfme(bm, f);
 	f1loop = bm_loop_create(bm, v2, e, f, v2loop, 0);

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-11-30 16:03:34 UTC (rev 52686)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-11-30 16:15:49 UTC (rev 52687)
@@ -142,11 +142,12 @@
 			return FALSE;
 		}
 #else
-		BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, e, TRUE);
-
-		if (!BM_vert_collapse_faces(bm, v->e, v, 1.0, FALSE, TRUE)) {
+		if (UNLIKELY(!BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, e, TRUE))) {
 			return FALSE;
 		}
+		else if (UNLIKELY(!BM_vert_collapse_faces(bm, v->e, v, 1.0, FALSE, TRUE))) {
+			return FALSE;
+		}
 #endif
 		return TRUE;
 	}

Modified: trunk/blender/source/tests/bl_run_operators.py
===================================================================
--- trunk/blender/source/tests/bl_run_operators.py	2012-11-30 16:03:34 UTC (rev 52686)
+++ trunk/blender/source/tests/bl_run_operators.py	2012-11-30 16:15:49 UTC (rev 52687)
@@ -35,13 +35,16 @@
     "*.open_*",
     "*.link_append",
     "render.render",
+    "render.play_rendered_anim",
     "*.*_export",
     "*.*_import",
     "wm.blenderplayer_start",
     "wm.url_open",
     "wm.doc_view",
     "wm.path_open",
-    "help.operator_cheat_sheet",
+    "wm.theme_install",
+    "wm.context_*",
+    "wm.operator_cheat_sheet",
     "wm.keyconfig_test",     # just annoying - but harmless
     "wm.memory_statistics",  # another annoying one
     "console.*",             # just annoying - but harmless