From 5155feeeb8a00f3a9bffa72c27bfb8dfd387b5fd Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 1 Feb 2024 12:53:36 -0500 Subject: [PATCH] Cleanup: UI: Remove a1 and a2 unused arguments from uiDefButF function These were removed in previous commits like e6f0b60c2e9111af1878. --- .../blender/editors/include/UI_interface_c.hh | 2 -- source/blender/editors/interface/interface.cc | 6 ++-- .../interface_region_color_picker.cc | 8 ----- .../editors/interface/interface_templates.cc | 16 ---------- .../editors/space_clip/clip_buttons.cc | 20 ------------ .../editors/space_view3d/view3d_buttons.cc | 32 ------------------- .../blender/editors/uvedit/uvedit_buttons.cc | 4 --- 7 files changed, 2 insertions(+), 86 deletions(-) diff --git a/source/blender/editors/include/UI_interface_c.hh b/source/blender/editors/include/UI_interface_c.hh index 760afb2abcf..27f21337e70 100644 --- a/source/blender/editors/include/UI_interface_c.hh +++ b/source/blender/editors/include/UI_interface_c.hh @@ -1010,8 +1010,6 @@ uiBut *uiDefButF(uiBlock *block, float *poin, float min, float max, - float a1, - float a2, const char *tip); uiBut *uiDefButI(uiBlock *block, int type, diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 1b92b0e3268..5b4da8c77db 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -5067,8 +5067,6 @@ uiBut *uiDefButF(uiBlock *block, float *poin, float min, float max, - float a1, - float a2, const char *tip) { return uiDefBut(block, @@ -5082,8 +5080,8 @@ uiBut *uiDefButF(uiBlock *block, (void *)poin, min, max, - a1, - a2, + 0.0f, + 0.0f, tip); } uiBut *uiDefButI(uiBlock *block, diff --git a/source/blender/editors/interface/interface_region_color_picker.cc b/source/blender/editors/interface/interface_region_color_picker.cc index 6940058830b..21883165a28 100644 --- a/source/blender/editors/interface/interface_region_color_picker.cc +++ b/source/blender/editors/interface/interface_region_color_picker.cc @@ -689,8 +689,6 @@ static void ui_block_colorpicker(uiBlock *block, cpicker->hsv_scene_linear, 0.0, 1.0, - 0, - 0, TIP_("Hue")); UI_but_number_slider_step_size_set(bt, 10); UI_but_number_slider_precision_set(bt, 3); @@ -708,8 +706,6 @@ static void ui_block_colorpicker(uiBlock *block, cpicker->hsv_scene_linear + 1, 0.0, 1.0, - 0, - 0, TIP_("Saturation")); UI_but_number_slider_step_size_set(bt, 10); UI_but_number_slider_precision_set(bt, 3); @@ -728,8 +724,6 @@ static void ui_block_colorpicker(uiBlock *block, cpicker->hsv_scene_linear + 2, 0.0, 1.0, - 0, - 0, TIP_("Lightness")); UI_but_number_slider_step_size_set(bt, 10); UI_but_number_slider_precision_set(bt, 3); @@ -746,8 +740,6 @@ static void ui_block_colorpicker(uiBlock *block, cpicker->hsv_scene_linear + 2, 0.0, softmax, - 0, - 0, CTX_TIP_(BLT_I18NCONTEXT_COLOR, "Value")); } UI_but_number_slider_step_size_set(bt, 10); diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index a6f31c71ed1..a17f66be1bc 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -4314,8 +4314,6 @@ static uiBlock *curvemap_clipping_func(bContext *C, ARegion *region, void *cumap &cumap->clipr.xmin, -100.0, cumap->clipr.xmax, - 0, - 0, ""); UI_but_number_step_size_set(bt, 10); UI_but_number_precision_set(bt, 2); @@ -4330,8 +4328,6 @@ static uiBlock *curvemap_clipping_func(bContext *C, ARegion *region, void *cumap &cumap->clipr.ymin, -100.0, cumap->clipr.ymax, - 0, - 0, ""); UI_but_number_step_size_set(bt, 10); UI_but_number_precision_set(bt, 2); @@ -4346,8 +4342,6 @@ static uiBlock *curvemap_clipping_func(bContext *C, ARegion *region, void *cumap &cumap->clipr.xmax, cumap->clipr.xmin, 100.0, - 0, - 0, ""); UI_but_number_step_size_set(bt, 10); UI_but_number_precision_set(bt, 2); @@ -4362,8 +4356,6 @@ static uiBlock *curvemap_clipping_func(bContext *C, ARegion *region, void *cumap &cumap->clipr.ymax, cumap->clipr.ymin, 100.0, - 0, - 0, ""); UI_but_number_step_size_set(bt, 10); UI_but_number_precision_set(bt, 2); @@ -4889,8 +4881,6 @@ static void curvemap_buttons_layout(uiLayout *layout, &cmp->x, bounds.xmin, bounds.xmax, - 0, - 0, ""); UI_but_number_step_size_set(bt, 1); UI_but_number_precision_set(bt, 5); @@ -4905,8 +4895,6 @@ static void curvemap_buttons_layout(uiLayout *layout, &cmp->y, bounds.ymin, bounds.ymax, - 0, - 0, ""); UI_but_number_step_size_set(bt, 1); UI_but_number_precision_set(bt, 5); @@ -5533,8 +5521,6 @@ static void CurveProfile_buttons_layout(uiLayout *layout, PointerRNA *ptr, RNAUp selection_x, bounds.xmin, bounds.xmax, - 0, - 0, ""); UI_but_number_step_size_set(bt, 1); UI_but_number_precision_set(bt, 5); @@ -5553,8 +5539,6 @@ static void CurveProfile_buttons_layout(uiLayout *layout, PointerRNA *ptr, RNAUp selection_y, bounds.ymin, bounds.ymax, - 0, - 0, ""); UI_but_number_step_size_set(bt, 1); UI_but_number_precision_set(bt, 5); diff --git a/source/blender/editors/space_clip/clip_buttons.cc b/source/blender/editors/space_clip/clip_buttons.cc index 294920e78b6..140dc127553 100644 --- a/source/blender/editors/space_clip/clip_buttons.cc +++ b/source/blender/editors/space_clip/clip_buttons.cc @@ -555,8 +555,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_pos[0], -10 * width, 10.0 * width, - 0, - 0, TIP_("X-position of marker at frame in screen coordinates")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -571,8 +569,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_pos[1], -10 * height, 10.0 * height, - 0, - 0, TIP_("Y-position of marker at frame in screen coordinates")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -602,8 +598,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->track_offset[0], -10 * width, 10.0 * width, - 0, - 0, TIP_("X-offset to parenting point")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -618,8 +612,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->track_offset[1], -10 * height, 10.0 * height, - 0, - 0, TIP_("Y-offset to parenting point")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -649,8 +641,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_pat[0], 3.0f, 10.0 * width, - 0, - 0, TIP_("Width of marker's pattern in screen coordinates")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -665,8 +655,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_pat[1], 3.0f, 10.0 * height, - 0, - 0, TIP_("Height of marker's pattern in screen coordinates")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -696,8 +684,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_search_pos[0], -width, width, - 0, - 0, TIP_("X-position of search at frame relative to marker's position")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -712,8 +698,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_search_pos[1], -height, height, - 0, - 0, TIP_("Y-position of search at frame relative to marker's position")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -728,8 +712,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_search[0], 3.0f, 10.0 * width, - 0, - 0, TIP_("Width of marker's search in screen coordinates")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); @@ -744,8 +726,6 @@ void uiTemplateMarker(uiLayout *layout, &cb->marker_search[1], 3.0f, 10.0 * height, - 0, - 0, TIP_("Height of marker's search in screen coordinates")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc index 665fbbfbe7c..1f4393cb593 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.cc +++ b/source/blender/editors/space_view3d/view3d_buttons.cc @@ -562,8 +562,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &tfp->ve_median.generic.location[0], -lim, lim, - 0, - 0, ""); UI_but_number_step_size_set(but, 10); UI_but_number_precision_set(but, RNA_TRANSLATION_PREC_DEFAULT); @@ -579,8 +577,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &tfp->ve_median.generic.location[1], -lim, lim, - 0, - 0, ""); UI_but_number_step_size_set(but, 10); UI_but_number_precision_set(but, RNA_TRANSLATION_PREC_DEFAULT); @@ -596,8 +592,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &tfp->ve_median.generic.location[2], -lim, lim, - 0, - 0, ""); UI_but_number_step_size_set(but, 10); UI_but_number_precision_set(but, RNA_TRANSLATION_PREC_DEFAULT); @@ -615,8 +609,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &(tfp->ve_median.curve.b_weight), 0.01, 100.0, - 0, - 0, ""); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); @@ -685,8 +677,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->bv_weight, 0.0, 1.0, - 0, - 0, TIP_("Vertex weight used by Bevel modifier")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 2); @@ -702,8 +692,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->v_crease, 0.0, 1.0, - 0, - 0, TIP_("Weight used by the Subdivision Surface modifier")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 2); @@ -721,8 +709,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->skin[0], 0.0, 100.0, - 0, - 0, TIP_("X radius used by Skin modifier")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); @@ -737,8 +723,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->skin[1], 0.0, 100.0, - 0, - 0, TIP_("Y radius used by Skin modifier")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); @@ -771,8 +755,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->be_weight, 0.0, 1.0, - 0, - 0, TIP_("Edge weight used by Bevel modifier")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 2); @@ -788,8 +770,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->e_crease, 0.0, 1.0, - 0, - 0, TIP_("Weight used by the Subdivision Surface modifier")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 2); @@ -866,8 +846,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->weight, 0.0, 1.0, - 0, - 0, TIP_("Weight used for Soft Body Goal")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); @@ -882,8 +860,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->radius, 0.0, 100.0, - 0, - 0, TIP_("Radius of curve control points")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); @@ -898,8 +874,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->tilt, -tilt_limit, tilt_limit, - 0, - 0, TIP_("Tilt of curve control points")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); @@ -941,8 +915,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float &ve_median->weight, 0.0, 1.0, - 0, - 0, TIP_("Weight used for Soft Body Goal")); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); @@ -1273,8 +1245,6 @@ static void v3d_object_dimension_buts(bContext *C, uiLayout *layout, View3D *v3d &(tfp->ob_dims[i]), 0.0f, lim, - 0, - 0, ""); UI_but_number_step_size_set(but, 10); UI_but_number_precision_set(but, 3); @@ -1441,8 +1411,6 @@ static void view3d_panel_vgroup(const bContext *C, Panel *panel) &vertex_weight, 0.0, 1.0, - 0, - 0, ""); UI_but_number_step_size_set(but, 1); UI_but_number_precision_set(but, 3); diff --git a/source/blender/editors/uvedit/uvedit_buttons.cc b/source/blender/editors/uvedit/uvedit_buttons.cc index 77a061422b8..16d499ba594 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.cc +++ b/source/blender/editors/uvedit/uvedit_buttons.cc @@ -169,8 +169,6 @@ static void uvedit_vertex_buttons(const bContext *C, uiBlock *block) UI_UNIT_Y, &uvedit_old_center[0], UNPACK2(range_xy[0]), - 0, - 0, ""); UI_but_number_step_size_set(but, step); UI_but_number_precision_set(but, digits); @@ -184,8 +182,6 @@ static void uvedit_vertex_buttons(const bContext *C, uiBlock *block) UI_UNIT_Y, &uvedit_old_center[1], UNPACK2(range_xy[1]), - 0, - 0, ""); UI_but_number_step_size_set(but, step); UI_but_number_precision_set(but, digits);