Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-08-07 18:20:45 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-08-07 18:21:20 +0400
commitec6043cd6641abc16d66067ab21b732f45f839bc (patch)
tree3966c2a19f4efc243c9ba797d7768d90ef83e442
parent4ce9447b086112fafbb7c744a49e0dd5a0dc6536 (diff)
picky - prefer braces
-rw-r--r--source/blender/editors/interface/interface_handlers.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 5569ced8bdb..3dffea27d16 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);
}