From e1023b22f15733c8abe9341aace6eb1b57bbf588 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 29 Feb 2024 22:38:42 -0500 Subject: [PATCH] Cleanup: UI: Remove more uses of a1 and a2 arguments Remove uses for `uiDefButS`. -1 was passed as a2 still in a few places, but that was most likely just because of copy & paste, it doesn't look like that's actually used anywhere. --- source/blender/editors/include/UI_interface_c.hh | 4 +--- source/blender/editors/interface/interface.cc | 6 ++---- .../editors/interface/interface_templates.cc | 16 ---------------- .../blender/editors/space_image/image_buttons.cc | 12 ------------ 4 files changed, 3 insertions(+), 35 deletions(-) diff --git a/source/blender/editors/include/UI_interface_c.hh b/source/blender/editors/include/UI_interface_c.hh index 4becc6d8178..37b5b093a64 100644 --- a/source/blender/editors/include/UI_interface_c.hh +++ b/source/blender/editors/include/UI_interface_c.hh @@ -1048,8 +1048,6 @@ uiBut *uiDefButS(uiBlock *block, short *poin, float min, float max, - float a1, - float a2, const char *tip); uiBut *uiDefButBitS(uiBlock *block, int type, @@ -3292,7 +3290,7 @@ ARegion *UI_tooltip_create_from_search_item_generic( /* Float precision helpers */ #define UI_PRECISION_FLOAT_MAX 6 -/* For float buttons the 'step' (or a1), is scaled */ +/* For float buttons the 'step', is scaled */ #define UI_PRECISION_FLOAT_SCALE 0.01f /* Typical UI text */ diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index a92f8605747..8134aaa28c6 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -5076,8 +5076,6 @@ uiBut *uiDefButS(uiBlock *block, short *poin, float min, float max, - float a1, - float a2, const char *tip) { return uiDefBut(block, @@ -5091,8 +5089,8 @@ uiBut *uiDefButS(uiBlock *block, (void *)poin, min, max, - a1, - a2, + 0.0f, + 0.0f, tip); } uiBut *uiDefButBitS(uiBlock *block, diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index 4f13b6ba580..93313decc34 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -3286,8 +3286,6 @@ void uiTemplatePreview(uiLayout *layout, pr_texture, 10, TEX_PR_TEXTURE, - 0, - 0, ""); if (GS(parent->name) == ID_MA) { uiDefButS(block, @@ -3301,8 +3299,6 @@ void uiTemplatePreview(uiLayout *layout, pr_texture, 10, TEX_PR_OTHER, - 0, - 0, ""); } else if (GS(parent->name) == ID_LA) { @@ -3317,8 +3313,6 @@ void uiTemplatePreview(uiLayout *layout, pr_texture, 10, TEX_PR_OTHER, - 0, - 0, ""); } else if (GS(parent->name) == ID_WO) { @@ -3333,8 +3327,6 @@ void uiTemplatePreview(uiLayout *layout, pr_texture, 10, TEX_PR_OTHER, - 0, - 0, ""); } else if (GS(parent->name) == ID_LS) { @@ -3349,8 +3341,6 @@ void uiTemplatePreview(uiLayout *layout, pr_texture, 10, TEX_PR_OTHER, - 0, - 0, ""); } uiDefButS(block, @@ -3364,8 +3354,6 @@ void uiTemplatePreview(uiLayout *layout, pr_texture, 10, TEX_PR_BOTH, - 0, - 0, ""); /* Alpha button for texture preview */ @@ -3724,8 +3712,6 @@ static void colorband_buttons_layout(uiLayout *layout, &coba->cur, 0.0, float(std::max(0, coba->tot - 1)), - 0, - 0, TIP_("Choose active color stop")); UI_but_number_step_size_set(bt, 1); @@ -3751,8 +3737,6 @@ static void colorband_buttons_layout(uiLayout *layout, &coba->cur, 0.0, float(std::max(0, coba->tot - 1)), - 0, - 0, TIP_("Choose active color stop")); UI_but_number_step_size_set(bt, 1); diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc index 13f1b491dae..00a3a5a641c 100644 --- a/source/blender/editors/space_image/image_buttons.cc +++ b/source/blender/editors/space_image/image_buttons.cc @@ -88,8 +88,6 @@ static void ui_imageuser_slot_menu(bContext * /*C*/, uiLayout *layout, void *ima &image->render_slot, float(slot_id), 0.0, - 0, - -1, ""); } @@ -182,8 +180,6 @@ static void ui_imageuser_layer_menu(bContext * /*C*/, uiLayout *layout, void *rn &iuser->layer, 0.0, 0.0, - 0, - -1, ""); } @@ -200,8 +196,6 @@ static void ui_imageuser_layer_menu(bContext * /*C*/, uiLayout *layout, void *rn &iuser->layer, float(nr), 0.0, - 0, - -1, ""); } @@ -276,8 +270,6 @@ static void ui_imageuser_pass_menu(bContext * /*C*/, uiLayout *layout, void *rnd &iuser->pass, float(nr), 0.0, - 0, - -1, ""); } @@ -355,8 +347,6 @@ static void ui_imageuser_view_menu_rr(bContext * /*C*/, uiLayout *layout, void * &iuser->view, float(nr), 0.0, - 0, - -1, ""); } @@ -405,8 +395,6 @@ static void ui_imageuser_view_menu_multiview(bContext * /*C*/, uiLayout *layout, &iuser->view, float(nr), 0.0, - 0, - -1, ""); } }