Revision: 52419
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52419
Author: cessen
Date: 2012-11-21 01:51:31 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Change edge loop select and edge ring select to be consistent with
other selection operators. Instead of having only a single "extend"
option which causes the selection to toggle, there are now
three options:
- extend: adds to selection
- deselect: removes from selection
- toggle: toggles the selection
The default keymap is adjusted to have identical behavior as before,
using these new options, so end-users shouldn't experience any
difference.
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/mesh_ops.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-11-21
01:07:30 UTC (rev 52418)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2012-11-21
01:51:31 UTC (rev 52419)
@@ -1083,7 +1083,7 @@
/* ***************** loop select (non modal) ************** */
-static void mouse_mesh_loop(bContext *C, int mval[2], short extend, short ring)
+static void mouse_mesh_loop(bContext *C, int mval[2], short extend, short
deselect, short toggle, short ring)
{
ViewContext vc;
BMEditMesh *em;
@@ -1102,16 +1102,22 @@
eed = EDBM_edge_find_nearest(&vc, &dist);
if (eed) {
- if (extend == 0) {
+ if (extend == 0 && deselect == 0 && toggle == 0) {
EDBM_flag_disable_all(em, BM_ELEM_SELECT);
}
- if (BM_elem_flag_test(eed, BM_ELEM_SELECT) == 0) {
+ if (extend) {
select = TRUE;
}
- else if (extend) {
+ else if (deselect) {
select = FALSE;
}
+ else if (BM_elem_flag_test(eed, BM_ELEM_SELECT) == 0) {
+ select = TRUE;
+ }
+ else if (toggle) {
+ select = FALSE;
+ }
if (em->selectmode & SCE_SELECT_FACE) {
walker_select(em, BMW_FACELOOP, eed, select);
@@ -1202,6 +1208,8 @@
view3d_operator_needs_opengl(C);
mouse_mesh_loop(C, event->mval, RNA_boolean_get(op->ptr, "extend"),
+ RNA_boolean_get(op->ptr, "deselect"),
+ RNA_boolean_get(op->ptr, "toggle"),
RNA_boolean_get(op->ptr, "ring"));
/* cannot do tweaks for as long this keymap is after transform map */
@@ -1224,6 +1232,8 @@
/* properties */
RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", "Extend the
selection");
+ RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Remove from the
selection");
+ RNA_def_boolean(ot->srna, "toggle", 0, "Toggle Select", "Toggle the
selection");
RNA_def_boolean(ot->srna, "ring", 0, "Select Ring", "Select ring");
}
@@ -1242,6 +1252,8 @@
ot->flag = OPTYPE_UNDO;
RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the
selection");
+ RNA_def_boolean(ot->srna, "deselect", 0, "Deselect", "Remove from the
selection");
+ RNA_def_boolean(ot->srna, "toggle", 0, "Toggle Select", "Toggle the
selection");
RNA_def_boolean(ot->srna, "ring", 1, "Select Ring", "Select ring");
}
Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c 2012-11-21
01:07:30 UTC (rev 52418)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c 2012-11-21
01:51:31 UTC (rev 52419)
@@ -278,13 +278,21 @@
/* standard mouse selection goes via space_view3d */
kmi = WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE,
KM_PRESS, KM_ALT, 0);
RNA_boolean_set(kmi->ptr, "extend", FALSE);
+ RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+ RNA_boolean_set(kmi->ptr, "toggle", FALSE);
kmi = WM_keymap_add_item(keymap, "MESH_OT_loop_select", SELECTMOUSE,
KM_PRESS, KM_SHIFT | KM_ALT, 0);
- RNA_boolean_set(kmi->ptr, "extend", TRUE);
+ RNA_boolean_set(kmi->ptr, "extend", FALSE);
+ RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+ RNA_boolean_set(kmi->ptr, "toggle", TRUE);
kmi = WM_keymap_add_item(keymap, "MESH_OT_edgering_select",
SELECTMOUSE, KM_PRESS, KM_ALT | KM_CTRL, 0);
RNA_boolean_set(kmi->ptr, "extend", FALSE);
+ RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+ RNA_boolean_set(kmi->ptr, "toggle", FALSE);
kmi = WM_keymap_add_item(keymap, "MESH_OT_edgering_select",
SELECTMOUSE, KM_PRESS, KM_SHIFT | KM_ALT | KM_CTRL, 0);
- RNA_boolean_set(kmi->ptr, "extend", TRUE);
+ RNA_boolean_set(kmi->ptr, "extend", FALSE);
+ RNA_boolean_set(kmi->ptr, "deselect", FALSE);
+ RNA_boolean_set(kmi->ptr, "toggle", TRUE);
WM_keymap_add_item(keymap, "MESH_OT_select_shortest_path", SELECTMOUSE,
KM_PRESS, KM_CTRL, 0);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
