[Bf-blender-cvs] [4469ca7f3e6] blender2.8: UV: rename circle select operator
Campbell Barton
noreply at git.blender.org
Thu Oct 4 05:22:04 CEST 2018
Commit: 4469ca7f3e66742e9d81c4a66b790cd990742830
Author: Campbell Barton
Date: Thu Oct 4 13:21:21 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB4469ca7f3e66742e9d81c4a66b790cd990742830
UV: rename circle select operator
Word order was swapped from all other operators.
===================================================================
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 4adf70c27ff..8897b69e7c3 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -3412,12 +3412,12 @@ static int uv_circle_select_exec(bContext *C, wmOperator *op)
return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
}
-static void UV_OT_circle_select(wmOperatorType *ot)
+static void UV_OT_select_circle(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Circle Select";
ot->description = "Select UV vertices using circle selection";
- ot->idname = "UV_OT_circle_select";
+ ot->idname = "UV_OT_select_circle";
/* api callbacks */
ot->invoke = WM_gesture_circle_invoke;
@@ -4647,7 +4647,7 @@ void ED_operatortypes_uvedit(void)
WM_operatortype_append(UV_OT_select_pinned);
WM_operatortype_append(UV_OT_select_border);
WM_operatortype_append(UV_OT_select_lasso);
- WM_operatortype_append(UV_OT_circle_select);
+ WM_operatortype_append(UV_OT_select_circle);
WM_operatortype_append(UV_OT_select_more);
WM_operatortype_append(UV_OT_select_less);
@@ -4719,7 +4719,7 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "UV_OT_select_border", BKEY, KM_PRESS, KM_CTRL, 0);
RNA_boolean_set(kmi->ptr, "pinned", true);
- WM_keymap_add_item(keymap, "UV_OT_circle_select", CKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "UV_OT_select_circle", CKEY, KM_PRESS, 0, 0);
kmi = WM_keymap_add_item(keymap, "UV_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL, 0);
RNA_boolean_set(kmi->ptr, "deselect", false);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index e6fc70389e5..21822c7c7f2 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -3232,7 +3232,7 @@ static void gesture_circle_modal_keymap(wmKeyConfig *keyconf)
/* assign map to operators */
WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_circle");
- WM_modalkeymap_assign(keymap, "UV_OT_circle_select");
+ WM_modalkeymap_assign(keymap, "UV_OT_select_circle");
WM_modalkeymap_assign(keymap, "CLIP_OT_select_circle");
WM_modalkeymap_assign(keymap, "MASK_OT_select_circle");
WM_modalkeymap_assign(keymap, "NODE_OT_select_circle");
More information about the Bf-blender-cvs
mailing list