diff options
author | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:20 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:20 +0300 |
commit | 4d46fac65d9946382c4be5b3842660e77468f00b (patch) | |
tree | c2910a4ca0b2d345007bf853d6484a1b9e53e4e1 /source/blender/editors/interface | |
parent | c594cfbe50497fdc365b3f327b643de507cda02f (diff) |
Cleanup: use count or num instead of nbr
Follow conventions from T85728.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface.c | 12 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_draw.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 3619a7ce317..e83a8761e12 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4238,28 +4238,28 @@ static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *bu int totitems = 0; int categories = 0; - int nbr_entries_nosepr = 0; + int entries_nosepr_count = 0; for (const EnumPropertyItem *item = item_array; item->identifier; item++, totitems++) { if (!item->identifier[0]) { /* inconsistent, but menus with categories do not look good flipped */ if (item->name) { block->flag |= UI_BLOCK_NO_FLIP; categories++; - nbr_entries_nosepr++; + entries_nosepr_count++; } - /* We do not want simple separators in nbr_entries_nosepr count */ + /* We do not want simple separators in `entries_nosepr_count`. */ continue; } - nbr_entries_nosepr++; + entries_nosepr_count++; } /* Columns and row estimation. Ignore simple separators here. */ - int columns = (nbr_entries_nosepr + 20) / 20; + int columns = (entries_nosepr_count + 20) / 20; if (columns < 1) { columns = 1; } if (columns > 8) { - columns = (nbr_entries_nosepr + 25) / 25; + columns = (entries_nosepr_count + 25) / 25; } int rows = totitems / columns; diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index decd8c03d70..c02024bc82d 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -546,13 +546,13 @@ void ui_draw_but_HISTOGRAM(ARegion *UNUSED(region), #undef HISTOGRAM_TOT_GRID_LINES -static void waveform_draw_one(float *waveform, int nbr, const float col[3]) +static void waveform_draw_one(float *waveform, int waveform_num, const float col[3]) { GPUVertFormat format = {0}; const uint pos_id = GPU_vertformat_attr_add(&format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); GPUVertBuf *vbo = GPU_vertbuf_create_with_format(&format); - GPU_vertbuf_data_alloc(vbo, nbr); + GPU_vertbuf_data_alloc(vbo, waveform_num); GPU_vertbuf_attr_fill(vbo, pos_id, waveform); |