blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: use eSpace_Type in switch statements 

Use eSpace_Type in cases where it's likely newly added spaces
should be handled.
This commit is contained in:
Campbell Barton 2020-05-07 11:15:32 +10:00
parent 5cb143cc4c
commit 1dced6d814
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/interface/interface_template_search_menu.c
View File

@ -492,7 +492,7 @@ static struct MenuSearch_Data *menu_items_from_ui_create(
if (area != NULL) {
SpaceLink *sl = area->spacedata.first;
switch (area->spacetype) {
switch ((eSpace_Type)area->spacetype) {
SPACE_MENU_MAP(SPACE_VIEW3D, "VIEW3D_MT_editor_menus");
SPACE_MENU_MAP(SPACE_GRAPH, "GRAPH_MT_editor_menus");
SPACE_MENU_MAP(SPACE_OUTLINER, "OUTLINER_MT_editor_menus");
@ -514,10 +514,10 @@ static struct MenuSearch_Data *menu_items_from_ui_create(
(((const SpaceClip *)sl)->mode == SC_MODE_TRACKING) ?
"CLIP_MT_tracking_editor_menus" :
"CLIP_MT_masking_editor_menus");
SPACE_MENU_NOP(SPACE_TOPBAR);
SPACE_MENU_NOP(SPACE_EMPTY);
SPACE_MENU_NOP(SPACE_SCRIPT);
SPACE_MENU_NOP(SPACE_STATUSBAR);
default:
printf("Unknown space type '%d'\n", area->spacetype);
SPACE_MENU_NOP(SPACE_TOPBAR);
}
}
for (int i = 0; i < idname_array_len; i++) {

2
source/blender/makesdna/DNA_space_types.h
View File

@ -1720,7 +1720,7 @@ typedef enum eSpace_Type {
SPACE_TOPBAR = 21,
SPACE_STATUSBAR = 22,
SPACE_TYPE_LAST = SPACE_STATUSBAR,
#define SPACE_TYPE_LAST SPACE_STATUSBAR
} eSpace_Type;
/* use for function args */

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

@ -532,7 +532,7 @@ static StructRNA *rna_Space_refine(struct PointerRNA *ptr)
{
SpaceLink *space = (SpaceLink *)ptr->data;
switch (space->spacetype) {
switch ((eSpace_Type)space->spacetype) {
case SPACE_VIEW3D:
return &RNA_SpaceView3D;
case SPACE_GRAPH:
@ -563,9 +563,16 @@ static StructRNA *rna_Space_refine(struct PointerRNA *ptr)
return &RNA_SpacePreferences;
case SPACE_CLIP:
return &RNA_SpaceClipEditor;
default:
return &RNA_Space;
/* Currently no type info. */
case SPACE_SCRIPT:
case SPACE_EMPTY:
case SPACE_TOPBAR:
case SPACE_STATUSBAR:
break;
}
return &RNA_Space;
}
static ScrArea *rna_area_from_space(PointerRNA *ptr)