[Bf-blender-cvs] [ec6043c] pie-menus: picky - prefer braces
Campbell Barton
noreply at git.blender.org
Thu Aug 7 16:21:46 CEST 2014
Commit: ec6043cd6641abc16d66067ab21b732f45f839bc
Author: Campbell Barton
Date: Fri Aug 8 00:20:45 2014 +1000
Branches: pie-menus
https://developer.blender.org/rBec6043cd6641abc16d66067ab21b732f45f839bc
picky - prefer braces
===================================================================
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 5569ced..3dffea2 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8524,8 +8524,9 @@ static int ui_but_pie_menu_apply(bContext *C, uiPopupBlockHandle *menu, uiBut *b
if (!force_close) {
uiBut *active_but = ui_but_find_activated(menu->region);
- if (active_but)
+ if (active_but) {
button_activate_exit(C, active_but, active_but->active, false, false);
+ }
button_activate_init(C, menu->region, but, BUTTON_ACTIVATE_OPEN);
return retval;
@@ -8542,8 +8543,9 @@ static int ui_but_pie_menu_apply(bContext *C, uiPopupBlockHandle *menu, uiBut *b
but->block->pie_data.flags |= UI_PIE_FINISHED;
menu->menuretval = 0;
}
- else
+ else {
menu->menuretval = UI_RETURN_OK;
+ }
}
}
else {
@@ -8552,8 +8554,9 @@ static int ui_but_pie_menu_apply(bContext *C, uiPopupBlockHandle *menu, uiBut *b
if (!(click_style || force_close)) {
block->pie_data.flags |= UI_PIE_FINISHED;
}
- else
+ else {
menu->menuretval = UI_RETURN_CANCEL;
+ }
ED_region_tag_redraw(menu->region);
}
More information about the Bf-blender-cvs
mailing list