diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-03 00:31:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-03 00:32:28 +0300 |
commit | c07eaa3384dfe90bc2671a9bb3be2b77ad33297d (patch) | |
tree | 0fdb4d7c21b10fa24a95be35aeab9dc58063403b /source/blender/editors/interface | |
parent | fcdd851858a61dbc7ec8cf79c0b9d022bb68f896 (diff) |
Cleanup: argument naming, redundant NULL checks
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index e0442ebcca2..174c2710863 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -9816,9 +9816,7 @@ static int ui_pie_handler(bContext *C, const wmEvent *event, uiPopupBlockHandle if (but && (U.pie_menu_confirm > 0) && (dist >= U.dpi_fac * (U.pie_menu_threshold + U.pie_menu_confirm))) { - if (but) { - return ui_but_pie_menu_apply(C, menu, but, true); - } + return ui_but_pie_menu_apply(C, menu, but, true); } retval = ui_but_pie_menu_apply(C, menu, but, true); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index c9bfafbe764..99594cf0803 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -371,7 +371,6 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_OBCENTER_DIA: cp = &ts->obcenter_dia; break; - break; case TH_EDGE: cp = ts->edge; break; |