diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/intern/idcode.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/intern/idcode.c')
-rw-r--r-- | source/blender/blenkernel/intern/idcode.c | 476 |
1 files changed, 242 insertions, 234 deletions
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c index 5e37f586a2a..0e9960755d8 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -35,12 +35,12 @@ #include "BKE_idcode.h" typedef struct { - unsigned short code; - const char *name, *plural; + unsigned short code; + const char *name, *plural; - const char *i18n_context; + const char *i18n_context; - int flags; + int flags; #define IDTYPE_FLAGS_ISLINKABLE (1 << 0) } IDType; @@ -52,48 +52,48 @@ typedef struct { * - Keep it in sync with i18n contexts in BLT_translation.h */ static IDType idtypes[] = { - /** ID's directly below must all be in #Main, and be kept in sync with #MAX_LIBARRAY (membership, not order) */ - {ID_AC, "Action", "actions", BLT_I18NCONTEXT_ID_ACTION, IDTYPE_FLAGS_ISLINKABLE}, - {ID_AR, "Armature", "armatures", BLT_I18NCONTEXT_ID_ARMATURE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_BR, "Brush", "brushes", BLT_I18NCONTEXT_ID_BRUSH, IDTYPE_FLAGS_ISLINKABLE}, - {ID_CA, "Camera", "cameras", BLT_I18NCONTEXT_ID_CAMERA, IDTYPE_FLAGS_ISLINKABLE}, - {ID_CF, "CacheFile", "cache_files", BLT_I18NCONTEXT_ID_CACHEFILE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_GR, "Collection", "collections", BLT_I18NCONTEXT_ID_COLLECTION, IDTYPE_FLAGS_ISLINKABLE}, - {ID_CU, "Curve", "curves", BLT_I18NCONTEXT_ID_CURVE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_GD, "GPencil", "grease_pencils", BLT_I18NCONTEXT_ID_GPENCIL, IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */ - - {ID_IM, "Image", "images", BLT_I18NCONTEXT_ID_IMAGE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_IP, "Ipo", "ipos", "", IDTYPE_FLAGS_ISLINKABLE}, /* deprecated */ - {ID_KE, "Key", "shape_keys", BLT_I18NCONTEXT_ID_SHAPEKEY, 0 }, - {ID_LA, "Light", "lights", BLT_I18NCONTEXT_ID_LIGHT, IDTYPE_FLAGS_ISLINKABLE}, - {ID_LI, "Library", "libraries", BLT_I18NCONTEXT_ID_LIBRARY, 0 }, - {ID_LS, "FreestyleLineStyle", "linestyles", BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_LT, "Lattice", "lattices", BLT_I18NCONTEXT_ID_LATTICE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_MA, "Material", "materials", BLT_I18NCONTEXT_ID_MATERIAL, IDTYPE_FLAGS_ISLINKABLE}, - {ID_MB, "Metaball", "metaballs", BLT_I18NCONTEXT_ID_METABALL, IDTYPE_FLAGS_ISLINKABLE}, - {ID_MC, "MovieClip", "movieclips", BLT_I18NCONTEXT_ID_MOVIECLIP, IDTYPE_FLAGS_ISLINKABLE}, - {ID_ME, "Mesh", "meshes", BLT_I18NCONTEXT_ID_MESH, IDTYPE_FLAGS_ISLINKABLE}, - {ID_MSK, "Mask", "masks", BLT_I18NCONTEXT_ID_MASK, IDTYPE_FLAGS_ISLINKABLE}, - {ID_NT, "NodeTree", "node_groups", BLT_I18NCONTEXT_ID_NODETREE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_OB, "Object", "objects", BLT_I18NCONTEXT_ID_OBJECT, IDTYPE_FLAGS_ISLINKABLE}, - {ID_PA, "ParticleSettings", "particles", BLT_I18NCONTEXT_ID_PARTICLESETTINGS, IDTYPE_FLAGS_ISLINKABLE}, - {ID_PAL, "Palettes", "palettes", BLT_I18NCONTEXT_ID_PALETTE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_PC, "PaintCurve", "paint_curves", BLT_I18NCONTEXT_ID_PAINTCURVE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_LP, "LightProbe", "lightprobes", BLT_I18NCONTEXT_ID_LIGHTPROBE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_SCE, "Scene", "scenes", BLT_I18NCONTEXT_ID_SCENE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_SCR, "Screen", "screens", BLT_I18NCONTEXT_ID_SCREEN, IDTYPE_FLAGS_ISLINKABLE}, - {ID_SEQ, "Sequence", "sequences", BLT_I18NCONTEXT_ID_SEQUENCE, 0 }, /* not actually ID data */ - {ID_SPK, "Speaker", "speakers", BLT_I18NCONTEXT_ID_SPEAKER, IDTYPE_FLAGS_ISLINKABLE}, - {ID_SO, "Sound", "sounds", BLT_I18NCONTEXT_ID_SOUND, IDTYPE_FLAGS_ISLINKABLE}, - {ID_TE, "Texture", "textures", BLT_I18NCONTEXT_ID_TEXTURE, IDTYPE_FLAGS_ISLINKABLE}, - {ID_TXT, "Text", "texts", BLT_I18NCONTEXT_ID_TEXT, IDTYPE_FLAGS_ISLINKABLE}, - {ID_VF, "VFont", "fonts", BLT_I18NCONTEXT_ID_VFONT, IDTYPE_FLAGS_ISLINKABLE}, - {ID_WO, "World", "worlds", BLT_I18NCONTEXT_ID_WORLD, IDTYPE_FLAGS_ISLINKABLE}, - {ID_WM, "WindowManager", "window_managers", BLT_I18NCONTEXT_ID_WINDOWMANAGER, 0 }, - {ID_WS, "WorkSpace", "workspaces", BLT_I18NCONTEXT_ID_WORKSPACE, IDTYPE_FLAGS_ISLINKABLE}, - - /** Keep last, not an ID exactly, only include for completeness */ - {ID_LINK_PLACEHOLDER, "Link Placeholder", "link_placeholders", BLT_I18NCONTEXT_ID_ID, 0}, /* plural is fake */ + /** ID's directly below must all be in #Main, and be kept in sync with #MAX_LIBARRAY (membership, not order) */ + {ID_AC, "Action", "actions", BLT_I18NCONTEXT_ID_ACTION, IDTYPE_FLAGS_ISLINKABLE}, + {ID_AR, "Armature", "armatures", BLT_I18NCONTEXT_ID_ARMATURE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_BR, "Brush", "brushes", BLT_I18NCONTEXT_ID_BRUSH, IDTYPE_FLAGS_ISLINKABLE}, + {ID_CA, "Camera", "cameras", BLT_I18NCONTEXT_ID_CAMERA, IDTYPE_FLAGS_ISLINKABLE}, + {ID_CF, "CacheFile", "cache_files", BLT_I18NCONTEXT_ID_CACHEFILE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_GR, "Collection", "collections", BLT_I18NCONTEXT_ID_COLLECTION, IDTYPE_FLAGS_ISLINKABLE}, + {ID_CU, "Curve", "curves", BLT_I18NCONTEXT_ID_CURVE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_GD, "GPencil", "grease_pencils", BLT_I18NCONTEXT_ID_GPENCIL, IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */ + + {ID_IM, "Image", "images", BLT_I18NCONTEXT_ID_IMAGE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_IP, "Ipo", "ipos", "", IDTYPE_FLAGS_ISLINKABLE}, /* deprecated */ + {ID_KE, "Key", "shape_keys", BLT_I18NCONTEXT_ID_SHAPEKEY, 0 }, + {ID_LA, "Light", "lights", BLT_I18NCONTEXT_ID_LIGHT, IDTYPE_FLAGS_ISLINKABLE}, + {ID_LI, "Library", "libraries", BLT_I18NCONTEXT_ID_LIBRARY, 0 }, + {ID_LS, "FreestyleLineStyle", "linestyles", BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_LT, "Lattice", "lattices", BLT_I18NCONTEXT_ID_LATTICE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_MA, "Material", "materials", BLT_I18NCONTEXT_ID_MATERIAL, IDTYPE_FLAGS_ISLINKABLE}, + {ID_MB, "Metaball", "metaballs", BLT_I18NCONTEXT_ID_METABALL, IDTYPE_FLAGS_ISLINKABLE}, + {ID_MC, "MovieClip", "movieclips", BLT_I18NCONTEXT_ID_MOVIECLIP, IDTYPE_FLAGS_ISLINKABLE}, + {ID_ME, "Mesh", "meshes", BLT_I18NCONTEXT_ID_MESH, IDTYPE_FLAGS_ISLINKABLE}, + {ID_MSK, "Mask", "masks", BLT_I18NCONTEXT_ID_MASK, IDTYPE_FLAGS_ISLINKABLE}, + {ID_NT, "NodeTree", "node_groups", BLT_I18NCONTEXT_ID_NODETREE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_OB, "Object", "objects", BLT_I18NCONTEXT_ID_OBJECT, IDTYPE_FLAGS_ISLINKABLE}, + {ID_PA, "ParticleSettings", "particles", BLT_I18NCONTEXT_ID_PARTICLESETTINGS, IDTYPE_FLAGS_ISLINKABLE}, + {ID_PAL, "Palettes", "palettes", BLT_I18NCONTEXT_ID_PALETTE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_PC, "PaintCurve", "paint_curves", BLT_I18NCONTEXT_ID_PAINTCURVE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_LP, "LightProbe", "lightprobes", BLT_I18NCONTEXT_ID_LIGHTPROBE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_SCE, "Scene", "scenes", BLT_I18NCONTEXT_ID_SCENE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_SCR, "Screen", "screens", BLT_I18NCONTEXT_ID_SCREEN, IDTYPE_FLAGS_ISLINKABLE}, + {ID_SEQ, "Sequence", "sequences", BLT_I18NCONTEXT_ID_SEQUENCE, 0 }, /* not actually ID data */ + {ID_SPK, "Speaker", "speakers", BLT_I18NCONTEXT_ID_SPEAKER, IDTYPE_FLAGS_ISLINKABLE}, + {ID_SO, "Sound", "sounds", BLT_I18NCONTEXT_ID_SOUND, IDTYPE_FLAGS_ISLINKABLE}, + {ID_TE, "Texture", "textures", BLT_I18NCONTEXT_ID_TEXTURE, IDTYPE_FLAGS_ISLINKABLE}, + {ID_TXT, "Text", "texts", BLT_I18NCONTEXT_ID_TEXT, IDTYPE_FLAGS_ISLINKABLE}, + {ID_VF, "VFont", "fonts", BLT_I18NCONTEXT_ID_VFONT, IDTYPE_FLAGS_ISLINKABLE}, + {ID_WO, "World", "worlds", BLT_I18NCONTEXT_ID_WORLD, IDTYPE_FLAGS_ISLINKABLE}, + {ID_WM, "WindowManager", "window_managers", BLT_I18NCONTEXT_ID_WINDOWMANAGER, 0 }, + {ID_WS, "WorkSpace", "workspaces", BLT_I18NCONTEXT_ID_WORKSPACE, IDTYPE_FLAGS_ISLINKABLE}, + + /** Keep last, not an ID exactly, only include for completeness */ + {ID_LINK_PLACEHOLDER, "Link Placeholder", "link_placeholders", BLT_I18NCONTEXT_ID_ID, 0}, /* plural is fake */ }; /* clang-format on */ @@ -102,25 +102,25 @@ BLI_STATIC_ASSERT((ARRAY_SIZE(idtypes) - 1 == MAX_LIBARRAY), "Missing IDType"); static IDType *idtype_from_name(const char *str) { - int i = ARRAY_SIZE(idtypes); + int i = ARRAY_SIZE(idtypes); - while (i--) { - if (STREQ(str, idtypes[i].name)) { - return &idtypes[i]; - } - } + while (i--) { + if (STREQ(str, idtypes[i].name)) { + return &idtypes[i]; + } + } - return NULL; + return NULL; } static IDType *idtype_from_code(short idcode) { - int i = ARRAY_SIZE(idtypes); + int i = ARRAY_SIZE(idtypes); - while (i--) - if (idcode == idtypes[i].code) - return &idtypes[i]; + while (i--) + if (idcode == idtypes[i].code) + return &idtypes[i]; - return NULL; + return NULL; } /** @@ -131,7 +131,7 @@ static IDType *idtype_from_code(short idcode) */ bool BKE_idcode_is_valid(short idcode) { - return idtype_from_code(idcode) ? true : false; + return idtype_from_code(idcode) ? true : false; } /** @@ -142,9 +142,9 @@ bool BKE_idcode_is_valid(short idcode) */ bool BKE_idcode_is_linkable(short idcode) { - IDType *idt = idtype_from_code(idcode); - BLI_assert(idt); - return idt ? ((idt->flags & IDTYPE_FLAGS_ISLINKABLE) != 0) : false; + IDType *idt = idtype_from_code(idcode); + BLI_assert(idt); + return idt ? ((idt->flags & IDTYPE_FLAGS_ISLINKABLE) != 0) : false; } /** @@ -156,9 +156,9 @@ bool BKE_idcode_is_linkable(short idcode) */ const char *BKE_idcode_to_name(short idcode) { - IDType *idt = idtype_from_code(idcode); - BLI_assert(idt); - return idt ? idt->name : NULL; + IDType *idt = idtype_from_code(idcode); + BLI_assert(idt); + return idt ? idt->name : NULL; } /** @@ -169,9 +169,9 @@ const char *BKE_idcode_to_name(short idcode) */ short BKE_idcode_from_name(const char *name) { - IDType *idt = idtype_from_name(name); - BLI_assert(idt); - return idt ? idt->code : 0; + IDType *idt = idtype_from_name(name); + BLI_assert(idt); + return idt ? idt->code : 0; } /** @@ -179,43 +179,45 @@ short BKE_idcode_from_name(const char *name) */ int BKE_idcode_to_idfilter(const short idcode) { -#define CASE_IDFILTER(_id) case ID_##_id: return FILTER_ID_##_id - - switch (idcode) { - CASE_IDFILTER(AC); - CASE_IDFILTER(AR); - CASE_IDFILTER(BR); - CASE_IDFILTER(CA); - CASE_IDFILTER(CF); - CASE_IDFILTER(CU); - CASE_IDFILTER(GD); - CASE_IDFILTER(GR); - CASE_IDFILTER(IM); - CASE_IDFILTER(LA); - CASE_IDFILTER(LS); - CASE_IDFILTER(LT); - CASE_IDFILTER(MA); - CASE_IDFILTER(MB); - CASE_IDFILTER(MC); - CASE_IDFILTER(ME); - CASE_IDFILTER(MSK); - CASE_IDFILTER(NT); - CASE_IDFILTER(OB); - CASE_IDFILTER(PA); - CASE_IDFILTER(PAL); - CASE_IDFILTER(PC); - CASE_IDFILTER(LP); - CASE_IDFILTER(SCE); - CASE_IDFILTER(SPK); - CASE_IDFILTER(SO); - CASE_IDFILTER(TE); - CASE_IDFILTER(TXT); - CASE_IDFILTER(VF); - CASE_IDFILTER(WO); - CASE_IDFILTER(WS); - default: - return 0; - } +#define CASE_IDFILTER(_id) \ + case ID_##_id: \ + return FILTER_ID_##_id + + switch (idcode) { + CASE_IDFILTER(AC); + CASE_IDFILTER(AR); + CASE_IDFILTER(BR); + CASE_IDFILTER(CA); + CASE_IDFILTER(CF); + CASE_IDFILTER(CU); + CASE_IDFILTER(GD); + CASE_IDFILTER(GR); + CASE_IDFILTER(IM); + CASE_IDFILTER(LA); + CASE_IDFILTER(LS); + CASE_IDFILTER(LT); + CASE_IDFILTER(MA); + CASE_IDFILTER(MB); + CASE_IDFILTER(MC); + CASE_IDFILTER(ME); + CASE_IDFILTER(MSK); + CASE_IDFILTER(NT); + CASE_IDFILTER(OB); + CASE_IDFILTER(PA); + CASE_IDFILTER(PAL); + CASE_IDFILTER(PC); + CASE_IDFILTER(LP); + CASE_IDFILTER(SCE); + CASE_IDFILTER(SPK); + CASE_IDFILTER(SO); + CASE_IDFILTER(TE); + CASE_IDFILTER(TXT); + CASE_IDFILTER(VF); + CASE_IDFILTER(WO); + CASE_IDFILTER(WS); + default: + return 0; + } #undef CASE_IDFILTER } @@ -225,42 +227,44 @@ int BKE_idcode_to_idfilter(const short idcode) */ short BKE_idcode_from_idfilter(const int idfilter) { -#define CASE_IDFILTER(_id) case FILTER_ID_##_id: return ID_##_id - - switch (idfilter) { - CASE_IDFILTER(AC); - CASE_IDFILTER(AR); - CASE_IDFILTER(BR); - CASE_IDFILTER(CA); - CASE_IDFILTER(CF); - CASE_IDFILTER(CU); - CASE_IDFILTER(GD); - CASE_IDFILTER(GR); - CASE_IDFILTER(IM); - CASE_IDFILTER(LA); - CASE_IDFILTER(LS); - CASE_IDFILTER(LT); - CASE_IDFILTER(MA); - CASE_IDFILTER(MB); - CASE_IDFILTER(MC); - CASE_IDFILTER(ME); - CASE_IDFILTER(MSK); - CASE_IDFILTER(NT); - CASE_IDFILTER(OB); - CASE_IDFILTER(PA); - CASE_IDFILTER(PAL); - CASE_IDFILTER(PC); - CASE_IDFILTER(LP); - CASE_IDFILTER(SCE); - CASE_IDFILTER(SPK); - CASE_IDFILTER(SO); - CASE_IDFILTER(TE); - CASE_IDFILTER(TXT); - CASE_IDFILTER(VF); - CASE_IDFILTER(WO); - default: - return 0; - } +#define CASE_IDFILTER(_id) \ + case FILTER_ID_##_id: \ + return ID_##_id + + switch (idfilter) { + CASE_IDFILTER(AC); + CASE_IDFILTER(AR); + CASE_IDFILTER(BR); + CASE_IDFILTER(CA); + CASE_IDFILTER(CF); + CASE_IDFILTER(CU); + CASE_IDFILTER(GD); + CASE_IDFILTER(GR); + CASE_IDFILTER(IM); + CASE_IDFILTER(LA); + CASE_IDFILTER(LS); + CASE_IDFILTER(LT); + CASE_IDFILTER(MA); + CASE_IDFILTER(MB); + CASE_IDFILTER(MC); + CASE_IDFILTER(ME); + CASE_IDFILTER(MSK); + CASE_IDFILTER(NT); + CASE_IDFILTER(OB); + CASE_IDFILTER(PA); + CASE_IDFILTER(PAL); + CASE_IDFILTER(PC); + CASE_IDFILTER(LP); + CASE_IDFILTER(SCE); + CASE_IDFILTER(SPK); + CASE_IDFILTER(SO); + CASE_IDFILTER(TE); + CASE_IDFILTER(TXT); + CASE_IDFILTER(VF); + CASE_IDFILTER(WO); + default: + return 0; + } #undef CASE_IDFILTER } @@ -270,49 +274,51 @@ short BKE_idcode_from_idfilter(const int idfilter) */ int BKE_idcode_to_index(const short idcode) { -#define CASE_IDINDEX(_id) case ID_##_id: return INDEX_ID_##_id - - switch ((ID_Type)idcode) { - CASE_IDINDEX(AC); - CASE_IDINDEX(AR); - CASE_IDINDEX(BR); - CASE_IDINDEX(CA); - CASE_IDINDEX(CF); - CASE_IDINDEX(CU); - CASE_IDINDEX(GD); - CASE_IDINDEX(GR); - CASE_IDINDEX(IM); - CASE_IDINDEX(KE); - CASE_IDINDEX(IP); - CASE_IDINDEX(LA); - CASE_IDINDEX(LI); - CASE_IDINDEX(LS); - CASE_IDINDEX(LT); - CASE_IDINDEX(MA); - CASE_IDINDEX(MB); - CASE_IDINDEX(MC); - CASE_IDINDEX(ME); - CASE_IDINDEX(MSK); - CASE_IDINDEX(NT); - CASE_IDINDEX(OB); - CASE_IDINDEX(PA); - CASE_IDINDEX(PAL); - CASE_IDINDEX(PC); - CASE_IDINDEX(LP); - CASE_IDINDEX(SCE); - CASE_IDINDEX(SCR); - CASE_IDINDEX(SPK); - CASE_IDINDEX(SO); - CASE_IDINDEX(TE); - CASE_IDINDEX(TXT); - CASE_IDINDEX(VF); - CASE_IDINDEX(WM); - CASE_IDINDEX(WO); - CASE_IDINDEX(WS); - } - - BLI_assert(0); - return -1; +#define CASE_IDINDEX(_id) \ + case ID_##_id: \ + return INDEX_ID_##_id + + switch ((ID_Type)idcode) { + CASE_IDINDEX(AC); + CASE_IDINDEX(AR); + CASE_IDINDEX(BR); + CASE_IDINDEX(CA); + CASE_IDINDEX(CF); + CASE_IDINDEX(CU); + CASE_IDINDEX(GD); + CASE_IDINDEX(GR); + CASE_IDINDEX(IM); + CASE_IDINDEX(KE); + CASE_IDINDEX(IP); + CASE_IDINDEX(LA); + CASE_IDINDEX(LI); + CASE_IDINDEX(LS); + CASE_IDINDEX(LT); + CASE_IDINDEX(MA); + CASE_IDINDEX(MB); + CASE_IDINDEX(MC); + CASE_IDINDEX(ME); + CASE_IDINDEX(MSK); + CASE_IDINDEX(NT); + CASE_IDINDEX(OB); + CASE_IDINDEX(PA); + CASE_IDINDEX(PAL); + CASE_IDINDEX(PC); + CASE_IDINDEX(LP); + CASE_IDINDEX(SCE); + CASE_IDINDEX(SCR); + CASE_IDINDEX(SPK); + CASE_IDINDEX(SO); + CASE_IDINDEX(TE); + CASE_IDINDEX(TXT); + CASE_IDINDEX(VF); + CASE_IDINDEX(WM); + CASE_IDINDEX(WO); + CASE_IDINDEX(WS); + } + + BLI_assert(0); + return -1; #undef CASE_IDINDEX } @@ -322,49 +328,51 @@ int BKE_idcode_to_index(const short idcode) */ short BKE_idcode_from_index(const int index) { -#define CASE_IDCODE(_id) case INDEX_ID_##_id: return ID_##_id - - switch (index) { - CASE_IDCODE(AC); - CASE_IDCODE(AR); - CASE_IDCODE(BR); - CASE_IDCODE(CA); - CASE_IDCODE(CF); - CASE_IDCODE(CU); - CASE_IDCODE(GD); - CASE_IDCODE(GR); - CASE_IDCODE(IM); - CASE_IDCODE(KE); - CASE_IDCODE(IP); - CASE_IDCODE(LA); - CASE_IDCODE(LI); - CASE_IDCODE(LS); - CASE_IDCODE(LT); - CASE_IDCODE(MA); - CASE_IDCODE(MB); - CASE_IDCODE(MC); - CASE_IDCODE(ME); - CASE_IDCODE(MSK); - CASE_IDCODE(NT); - CASE_IDCODE(OB); - CASE_IDCODE(PA); - CASE_IDCODE(PAL); - CASE_IDCODE(PC); - CASE_IDCODE(LP); - CASE_IDCODE(SCE); - CASE_IDCODE(SCR); - CASE_IDCODE(SPK); - CASE_IDCODE(SO); - CASE_IDCODE(TE); - CASE_IDCODE(TXT); - CASE_IDCODE(VF); - CASE_IDCODE(WM); - CASE_IDCODE(WO); - CASE_IDCODE(WS); - } - - BLI_assert(0); - return -1; +#define CASE_IDCODE(_id) \ + case INDEX_ID_##_id: \ + return ID_##_id + + switch (index) { + CASE_IDCODE(AC); + CASE_IDCODE(AR); + CASE_IDCODE(BR); + CASE_IDCODE(CA); + CASE_IDCODE(CF); + CASE_IDCODE(CU); + CASE_IDCODE(GD); + CASE_IDCODE(GR); + CASE_IDCODE(IM); + CASE_IDCODE(KE); + CASE_IDCODE(IP); + CASE_IDCODE(LA); + CASE_IDCODE(LI); + CASE_IDCODE(LS); + CASE_IDCODE(LT); + CASE_IDCODE(MA); + CASE_IDCODE(MB); + CASE_IDCODE(MC); + CASE_IDCODE(ME); + CASE_IDCODE(MSK); + CASE_IDCODE(NT); + CASE_IDCODE(OB); + CASE_IDCODE(PA); + CASE_IDCODE(PAL); + CASE_IDCODE(PC); + CASE_IDCODE(LP); + CASE_IDCODE(SCE); + CASE_IDCODE(SCR); + CASE_IDCODE(SPK); + CASE_IDCODE(SO); + CASE_IDCODE(TE); + CASE_IDCODE(TXT); + CASE_IDCODE(VF); + CASE_IDCODE(WM); + CASE_IDCODE(WO); + CASE_IDCODE(WS); + } + + BLI_assert(0); + return -1; #undef CASE_IDCODE } @@ -378,9 +386,9 @@ short BKE_idcode_from_index(const int index) */ const char *BKE_idcode_to_name_plural(short idcode) { - IDType *idt = idtype_from_code(idcode); - BLI_assert(idt); - return idt ? idt->plural : NULL; + IDType *idt = idtype_from_code(idcode); + BLI_assert(idt); + return idt ? idt->plural : NULL; } /** @@ -391,9 +399,9 @@ const char *BKE_idcode_to_name_plural(short idcode) */ const char *BKE_idcode_to_translation_context(short idcode) { - IDType *idt = idtype_from_code(idcode); - BLI_assert(idt); - return idt ? idt->i18n_context : BLT_I18NCONTEXT_DEFAULT; + IDType *idt = idtype_from_code(idcode); + BLI_assert(idt); + return idt ? idt->i18n_context : BLT_I18NCONTEXT_DEFAULT; } /** @@ -404,5 +412,5 @@ const char *BKE_idcode_to_translation_context(short idcode) */ short BKE_idcode_iter_step(int *index) { - return (*index < ARRAY_SIZE(idtypes)) ? idtypes[(*index)++].code : 0; + return (*index < ARRAY_SIZE(idtypes)) ? idtypes[(*index)++].code : 0; } |