[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45335] trunk/blender/source/blender: adding back boundary inset support.

[Campbell Barton]

Revision: 45335
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45335
Author:   campbellbarton
Date:     2012-04-02 08:58:26 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
adding back boundary inset support. was disabled because at one point it was unstable.

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

Modified: trunk/blender/source/blender/bmesh/operators/bmo_inset.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_inset.c	2012-04-02 08:35:12 UTC (rev 45334)
+++ trunk/blender/source/blender/bmesh/operators/bmo_inset.c	2012-04-02 08:58:26 UTC (rev 45335)
@@ -187,6 +187,7 @@
 		edge_loop_tangent(es->e_new, es->l, es->no);
 
 		if (es->e_new == es->e_old) { /* happens on boundary edges */
+			/* take care here, we're creating this double edge which _must_ have its verts replaced later on */
 			es->e_old = BM_edge_create(bm, es->e_new->v1, es->e_new->v2, es->e_new, FALSE);
 		}
 
@@ -254,7 +255,7 @@
 					/* find adjacent */
 					BM_ITER(e, &iter, bm, BM_EDGES_OF_VERT, v_split) {
 						if (BM_elem_flag_test(e, BM_ELEM_TAG) &&
-						    BM_elem_flag_test(e->l->f, BM_ELEM_TAG))
+						    e->l && BM_elem_flag_test(e->l->f, BM_ELEM_TAG))
 						{
 							if (vert_edge_tag_tot < 2) {
 								vecpair[vert_edge_tag_tot] = BM_elem_index_get(e);

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-02 08:35:12 UTC (rev 45334)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-02 08:58:26 UTC (rev 45335)
@@ -4505,7 +4505,7 @@
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BMEdit_FromObject(obedit);
 	BMOperator bmop;
-	const int use_boundary        = FALSE; //RNA_boolean_get(op->ptr, "use_boundary");
+	const int use_boundary        = RNA_boolean_get(op->ptr, "use_boundary");
 	const int use_even_offset     = RNA_boolean_get(op->ptr, "use_even_offset");
 	const int use_relative_offset = RNA_boolean_get(op->ptr, "use_relative_offset");
 	const float thickness         = RNA_float_get(op->ptr, "thickness");
@@ -4548,7 +4548,7 @@
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	// RNA_def_boolean(ot->srna, "use_boundary",        TRUE, "Boundary",  "Inset face boundries");
+	RNA_def_boolean(ot->srna, "use_boundary",        TRUE, "Boundary",  "Inset face boundries");
 	RNA_def_boolean(ot->srna, "use_even_offset",     TRUE, "Offset Even",      "Scale the offset to give more even thickness");
 	RNA_def_boolean(ot->srna, "use_relative_offset", FALSE, "Offset Relative", "Scale the offset by surrounding geometry");