Commit: 6919ea17265655383bae1c3770a983e1e0ae69cd
Author: Severin
Date: Thu Dec 4 20:12:49 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB6919ea17265655383bae1c3770a983e1e0ae69cd
IME: Fix Crash on Escape Cancel
===================================================================
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 e18150d..097fdb2 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2658,6 +2658,12 @@ static void ui_do_but_textedit(bContext *C, uiBlock
*block, uiBut *but, uiHandle
case RIGHTMOUSE:
case ESCKEY:
if (event->val == KM_PRESS) {
+#ifdef WITH_INPUT_IME
+ /* skips button handling since it is not wanted
*/
+ if (is_ime_composing) {
+ break;
+ }
+#endif
data->cancel = true;
data->escapecancel = true;
button_activate_state(C, but,
BUTTON_STATE_EXIT);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
