[Bf-blender-cvs] [e7e14934f85] master: UI: allow to cancel editing of vector widgets with escape and RMB
Alessio Monti di Sopra
noreply at git.blender.org
Fri May 10 17:25:22 CEST 2019
Commit: e7e14934f850e60c007b64b6bf469e09503d0886
Author: Alessio Monti di Sopra
Date: Fri May 10 17:21:24 2019 +0200
Branches: master
https://developer.blender.org/rBe7e14934f850e60c007b64b6bf469e09503d0886
UI: allow to cancel editing of vector widgets with escape and RMB
Differential Revision: https://developer.blender.org/D4838
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index fe70509d4c2..3cc478c99f2 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -5622,6 +5622,13 @@ static int ui_do_but_UNITVEC(
}
}
}
+ else if (event->type == ESCKEY || event->type == RIGHTMOUSE) {
+ if (event->val == KM_PRESS) {
+ data->cancel = true;
+ data->escapecancel = true;
+ button_activate_state(C, but, BUTTON_STATE_EXIT);
+ }
+ }
else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
More information about the Bf-blender-cvs
mailing list