Commit: 700346d377dd288ededc20b636162e28496fa84c
Author: Brecht Van Lommel
Date: Sat Mar 30 20:30:35 2019 +0100
Branches: master
https://developer.blender.org/rB700346d377dd288ededc20b636162e28496fa84c
Fix T63137: crash pressing enter to confirm menu, after recent changes.
===================================================================
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 ebd263e9f99..2641b28554c 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -9259,7 +9259,7 @@ static int ui_handle_menu_event(
else if (ELEM(event->type, RETKEY, PADENTER) &&
event->val == KM_PRESS) {
uiBut *but_default =
ui_region_find_first_but_test_flag(ar, UI_BUT_ACTIVE_DEFAULT, UI_HIDDEN);
if ((but_default != NULL) &&
(but_default->active == NULL)) {
- if (but->type == UI_BTYPE_BUT) {
+ if (but_default->type == UI_BTYPE_BUT) {
UI_but_execute(C, but_default);
}
else {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
