[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55862] trunk/blender/source/blender/bmesh /operators/bmo_inset.c: remove error checks for inset, adding a faces in this instance wont fail ( or if it does - theres a bug elsewhere).

Campbell Barton ideasman42 at gmail.com
Sun Apr 7 03:18:54 CEST 2013


Revision: 55862
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55862
Author:   campbellbarton
Date:     2013-04-07 01:18:52 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
remove error checks for inset, adding a faces in this instance wont fail (or if it does - theres a bug elsewhere).

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_inset.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_inset.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_inset.c	2013-04-07 00:13:04 UTC (rev 55861)
+++ trunk/blender/source/blender/bmesh/operators/bmo_inset.c	2013-04-07 01:18:52 UTC (rev 55862)
@@ -156,13 +156,7 @@
 			BMFace *f_new_inner;
 			/* Create New Inset Faces */
 			f_new_inner = BM_face_create(bm, f_verts, f_edges, f->len, 0);
-			if (UNLIKELY(f_new_inner == NULL)) {
-				BMO_error_raise(bm, op, BMERR_MESH_ERROR, "Inset failed: could not create inner face.");
-				BLI_array_free(f_edges);
-				BLI_array_free(f_verts);
-				BLI_array_free(eiinfo_arr);
-				return;
-			}
+			BLI_assert(f_new_inner != NULL);  /* no reason it should fail */
 
 			/* Copy Face Data */
 			BM_elem_attrs_copy(bm, bm, f, f_new_inner);
@@ -192,13 +186,7 @@
 			                                      l_iter_inner->v,
 			                                      f, false);
 
-			if (UNLIKELY(f_new_outer == NULL)) {
-				BMO_error_raise(bm, op, BMERR_MESH_ERROR, "Inset failed: could not create an outer face.");
-				BLI_array_free(f_edges);
-				BLI_array_free(f_verts);
-				BLI_array_free(eiinfo_arr);
-				return;
-			}
+			BLI_assert(f_new_outer != NULL);  /* no reason it should fail */
 
 			BM_elem_attrs_copy(bm, bm, f, f_new_outer);
 			BMO_elem_flag_enable(bm, f_new_outer, ELE_NEW);




More information about the Bf-blender-cvs mailing list