Fix T70504: Moving nodes in the node editor stops after hotkey is lifted
This basically reverts 540eb2dc1e
for an alternative solution that
only enforforces release_confirm [ignoring the preference] on mouse for
the node editor.
Approved by @brecht in T70504.
This commit is contained in:
parent
40492251f2
commit
295f888433
Notes:
blender-bot
2023-02-14 01:00:54 +01:00
Referenced by issue #70504, Moving nodes in the node editor stops after hotkey is lifted Referenced by issue #69288, Release confirms setting affects the node editors
|
@ -143,7 +143,6 @@ void ED_operatormacros_node(void)
|
|||
"Move nodes and attach to frame",
|
||||
OPTYPE_UNDO | OPTYPE_REGISTER);
|
||||
mot = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
|
||||
RNA_boolean_set(mot->ptr, "release_confirm", true);
|
||||
WM_operatortype_macro_define(ot, "NODE_OT_attach");
|
||||
WM_operatortype_macro_define(ot, "NODE_OT_insert_offset");
|
||||
|
||||
|
@ -153,7 +152,6 @@ void ED_operatormacros_node(void)
|
|||
"Move nodes and attach to frame",
|
||||
OPTYPE_UNDO | OPTYPE_REGISTER);
|
||||
mot = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
|
||||
RNA_boolean_set(mot->ptr, "release_confirm", true);
|
||||
RNA_boolean_set(mot->ptr, "remove_on_cancel", true);
|
||||
WM_operatortype_macro_define(ot, "NODE_OT_attach");
|
||||
WM_operatortype_macro_define(ot, "NODE_OT_insert_offset");
|
||||
|
|
|
@ -1707,7 +1707,8 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
|
|||
}
|
||||
}
|
||||
else {
|
||||
if (ISMOUSE(t->launch_event) && (U.flag & USER_RELEASECONFIRM)) {
|
||||
/* Release confirms preference should not affect node editor (T69288, T70504). */
|
||||
if (ISMOUSE(t->launch_event) && ((U.flag & USER_RELEASECONFIRM) || (t->spacetype == SPACE_NODE))) {
|
||||
/* Global "release confirm" on mouse bindings */
|
||||
t->flag |= T_RELEASE_CONFIRM;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue