[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45440] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: option to have inset face select the interior faces (mango request)

Campbell Barton ideasman42 at gmail.com
Fri Apr 6 12:33:46 CEST 2012


Revision: 45440
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45440
Author:   campbellbarton
Date:     2012-04-06 10:33:45 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
option to have inset face select the interior faces (mango request)

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

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-06 10:24:15 UTC (rev 45439)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-04-06 10:33:45 UTC (rev 45440)
@@ -4517,6 +4517,7 @@
 	const int use_relative_offset = RNA_boolean_get(op->ptr, "use_relative_offset");
 	const float thickness         = RNA_float_get(op->ptr, "thickness");
 	const int use_outset          = RNA_boolean_get(op->ptr, "use_outset");
+	const int use_select_inset    = RNA_boolean_get(op->ptr, "use_select_inset"); /* not passed onto the BMO */
 
 	EDBM_op_init(em, &bmop, op,
 	             "inset faces=%hf use_boundary=%b use_even_offset=%b use_relative_offset=%b thickness=%f use_outset=%b",
@@ -4524,11 +4525,15 @@
 
 	BMO_op_exec(em->bm, &bmop);
 
-	/* deselect original verts */
-	EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+	if (use_select_inset) {
+		/* deselect original faces/verts */
+		EDBM_flag_disable_all(em, BM_ELEM_SELECT);
+		BMO_slot_buffer_hflag_enable(em->bm, &bmop, "faceout", BM_FACE, BM_ELEM_SELECT, TRUE);
+	}
+	else {
+		BMO_slot_buffer_hflag_disable(em->bm, &bmop, "faceout", BM_FACE, BM_ELEM_SELECT, TRUE);
+	}
 
-	BMO_slot_buffer_hflag_enable(em->bm, &bmop, "faceout", BM_FACE, BM_ELEM_SELECT, TRUE);
-
 	if (!EDBM_op_finish(em, &bmop, op, TRUE)) {
 		return OPERATOR_CANCELLED;
 	}
@@ -4564,4 +4569,5 @@
 	RNA_def_property_ui_range(prop, 0.0, 1.0, 0.01, 4);
 
 	RNA_def_boolean(ot->srna, "use_outset", FALSE, "Outset", "Outset rather than inset");
+	RNA_def_boolean(ot->srna, "use_select_inset", TRUE, "Select Outer", "Select the new inset faces");
 }




More information about the Bf-blender-cvs mailing list