blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: Use short for properties editor tab list 

Because the active context is stored as a short in DNA it's better
to use short in the code surrounding it. Also adjusted a comment
that reflected an incorrect assumption.
This commit is contained in:
Hans Goudey 2020-10-05 09:31:32 -05:00
parent 7f3fe5b45c
commit 0a0e88b645
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_buttons.h
View File

@ -28,7 +28,7 @@ extern "C" {
struct SpaceProperties;
int ED_buttons_tabs_list(struct SpaceProperties *sbuts, int *context_tabs_array);
int ED_buttons_tabs_list(struct SpaceProperties *sbuts, short *context_tabs_array);
#ifdef __cplusplus
}

2
source/blender/editors/space_buttons/space_buttons.c
View File

@ -156,7 +156,7 @@ static void buttons_main_region_init(wmWindowManager *wm, ARegion *region)
*
* \return The total number of items in the array returned.
*/
int ED_buttons_tabs_list(SpaceProperties *sbuts, int *context_tabs_array)
int ED_buttons_tabs_list(SpaceProperties *sbuts, short *context_tabs_array)
{
int length = 0;
if (sbuts->pathflag & (1 << BCONTEXT_TOOL)) {

8
source/blender/makesrna/intern/rna_space.c
View File

@ -1777,11 +1777,9 @@ static const EnumPropertyItem *rna_SpaceProperties_context_itemf(bContext *UNUSE
SpaceProperties *sbuts = (SpaceProperties *)(ptr->data);
EnumPropertyItem *item = NULL;
/* We use 32 tabs maximum here so a flag for each can fit into a 32 bit integer flag.
* A theoretical maximum would be BCONTEXT_TOT * 2, with every tab displayed and a spacer
* in every other item. But this size is currently limited by the size of integer
* supported by RNA enums. */
int context_tabs_array[32];
/* Although it would never reach this amount, a theoretical maximum number of tabs
* is BCONTEXT_TOT * 2, with every tab displayed and a spacer in every other item. */
short context_tabs_array[BCONTEXT_TOT * 2];
int totitem = ED_buttons_tabs_list(sbuts, context_tabs_array);
BLI_assert(totitem <= ARRAY_SIZE(context_tabs_array));