[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49298] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: use B key to toggle 'boundary' option for modal inset.
Campbell Barton
ideasman42 at gmail.com
Fri Jul 27 16:17:05 CEST 2012
Revision: 49298
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49298
Author: campbellbarton
Date: 2012-07-27 14:17:05 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
use B key to toggle 'boundary' option for modal inset.
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-07-27 13:57:03 UTC (rev 49297)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-07-27 14:17:05 UTC (rev 49298)
@@ -4646,6 +4646,7 @@
return OPERATOR_RUNNING_MODAL;
}
}
+
switch (event->type) {
case ESCKEY:
case RIGHTMOUSE:
@@ -4678,7 +4679,7 @@
edbm_bevel_calc(C, op);
edbm_bevel_update_header(op, C);
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case LEFTMOUSE:
case PADENTER:
@@ -4695,7 +4696,7 @@
edbm_bevel_calc(C, op);
edbm_bevel_update_header(op, C);
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case DKEY:
if (event->val == KM_PRESS) {
@@ -4705,7 +4706,7 @@
edbm_bevel_calc(C, op);
edbm_bevel_update_header(op, C);
}
- return OPERATOR_RUNNING_MODAL;
+ break;
}
return OPERATOR_RUNNING_MODAL;
@@ -4785,7 +4786,12 @@
{
InsetData *opdata = op->customdata;
- static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RClick), thickness: %s, depth (Ctrl to tweak): %s (%s), Outset (O): (%s)";
+ static const char str[] = "Confirm: Enter/LClick, "
+ "Cancel: (Esc/RClick), "
+ "thickness: %s, "
+ "depth (Ctrl to tweak): %s (%s), "
+ "Outset (O): (%s), "
+ "Boundary (B): (%s)";
char msg[HEADER_LENGTH];
ScrArea *sa = CTX_wm_area(C);
@@ -4802,7 +4808,8 @@
flts_str,
flts_str + NUM_STR_REP_LEN,
opdata->modify_depth ? "On" : "Off",
- RNA_boolean_get(op->ptr, "use_outset") ? "On" : "Off"
+ RNA_boolean_get(op->ptr, "use_outset") ? "On" : "Off",
+ RNA_boolean_get(op->ptr, "use_boundary") ? "On" : "Off"
);
ED_area_headerprint(sa, msg);
@@ -4982,6 +4989,7 @@
}
}
}
+
switch (event->type) {
case ESCKEY:
case RIGHTMOUSE:
@@ -5019,7 +5027,7 @@
return OPERATOR_CANCELLED;
}
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case LEFTMOUSE:
case PADENTER:
@@ -5041,7 +5049,7 @@
opdata->shift_amount = 0.0f;
opdata->shift = FALSE;
}
- return OPERATOR_RUNNING_MODAL;
+ break;
case LEFTCTRLKEY:
case RIGHTCTRLKEY:
@@ -5066,7 +5074,7 @@
opdata->initial_length = len_v2(mlen);
edbm_inset_update_header(op, C);
- return OPERATOR_RUNNING_MODAL;
+ break;
}
case OKEY:
@@ -5075,13 +5083,26 @@
RNA_boolean_set(op->ptr, "use_outset", !use_outset);
if (edbm_inset_calc(C, op)) {
edbm_inset_update_header(op, C);
- return OPERATOR_RUNNING_MODAL;
}
else {
edbm_inset_cancel(C, op);
return OPERATOR_CANCELLED;
}
}
+ break;
+ case BKEY:
+ if (event->val == KM_PRESS) {
+ int use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
+ RNA_boolean_set(op->ptr, "use_boundary", !use_boundary);
+ if (edbm_inset_calc(C, op)) {
+ edbm_inset_update_header(op, C);
+ }
+ else {
+ edbm_inset_cancel(C, op);
+ return OPERATOR_CANCELLED;
+ }
+ }
+ break;
}
return OPERATOR_RUNNING_MODAL;
More information about the Bf-blender-cvs
mailing list