[Bf-blender-cvs] [426ff481a78] master: Event System: match click-drag & tweak event handling for transform
Campbell Barton
noreply at git.blender.org
Wed Mar 2 04:54:48 CET 2022
Commit: 426ff481a789017bd5810a2064ec06a298a6f2dc
Author: Campbell Barton
Date: Wed Mar 2 14:53:15 2022 +1100
Branches: master
https://developer.blender.org/rB426ff481a789017bd5810a2064ec06a298a6f2dc
Event System: match click-drag & tweak event handling for transform
===================================================================
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_convert_graph.c
===================================================================
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index d7a71350934..36ffcc8cd68 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1697,7 +1697,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
/* Needed to translate tweak events to mouse buttons. */
t->launch_event = event ? WM_userdef_event_type_from_keymap_type(event->type) : -1;
- t->is_launch_event_tweak = event ? ISTWEAK(event->type) : false;
+ t->is_launch_event_drag = event ? (ISTWEAK(event->type) || event->val == KM_CLICK_DRAG) : false;
/* XXX Remove this when wm_operator_call_internal doesn't use window->eventstate
* (which can have type = 0) */
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 757c11f1179..3ee5868d5be 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -592,9 +592,11 @@ typedef struct TransInfo {
/*************** NEW STUFF *********************/
/** event type used to launch transform. */
short launch_event;
- /** Is the actual launch event a tweak event? (launch_event above is set to the corresponding
- * mouse button then.) */
- bool is_launch_event_tweak;
+ /**
+ * Is the actual launch event a drag event?
+ * (`launch_event` is set to the corresponding mouse button then.)
+ */
+ bool is_launch_event_drag;
bool is_orient_default_overwrite;
diff --git a/source/blender/editors/transform/transform_convert_graph.c b/source/blender/editors/transform/transform_convert_graph.c
index 608fd59c8b7..54222fbb117 100644
--- a/source/blender/editors/transform/transform_convert_graph.c
+++ b/source/blender/editors/transform/transform_convert_graph.c
@@ -161,7 +161,7 @@ static void graph_bezt_get_transform_selection(const TransInfo *t,
bool left = use_handle ? ((bezt->f1 & SELECT) != 0) : key;
bool right = use_handle ? ((bezt->f3 & SELECT) != 0) : key;
- if (use_handle && t->is_launch_event_tweak) {
+ if (use_handle && t->is_launch_event_drag) {
if (sipo->runtime.flag & SIPO_RUNTIME_FLAG_TWEAK_HANDLES_LEFT) {
key = right = false;
}
More information about the Bf-blender-cvs
mailing list