From 85ca3156fc3539897789871fbb479ebc6e442fbc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 3 May 2017 05:20:58 +1000 Subject: Cleanup: typedef for empty list Without this the intent isn't clear. --- source/blender/draw/intern/DRW_render.h | 6 +++++- source/blender/draw/modes/edit_armature_mode.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender') diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 29295e8f06d..15ed8aeb979 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -74,7 +74,11 @@ typedef struct DRWInterface DRWInterface; typedef struct DRWPass DRWPass; typedef struct DRWShadingGroup DRWShadingGroup; -#define DRW_VIEWPORT_LIST_SIZE(list) (sizeof(list) == sizeof(char) ? 0 : ((sizeof(list)) / sizeof(void *))) +/* declare members as empty (unused) */ +typedef char DRWViewportEmptyList; + +#define DRW_VIEWPORT_LIST_SIZE(list) \ + (sizeof(list) == sizeof(DRWViewportEmptyList) ? 0 : ((sizeof(list)) / sizeof(void *))) /* Unused members must be either pass list or 'char *' when not usd. */ #define DRW_VIEWPORT_DATA_SIZE(ty) { \ diff --git a/source/blender/draw/modes/edit_armature_mode.c b/source/blender/draw/modes/edit_armature_mode.c index 19b8262a74e..87570c35c70 100644 --- a/source/blender/draw/modes/edit_armature_mode.c +++ b/source/blender/draw/modes/edit_armature_mode.c @@ -47,8 +47,8 @@ typedef struct EDIT_ARMATURE_StorageList { typedef struct EDIT_ARMATURE_Data { void *engine_type; - char *fbl; - char *txl; + DRWViewportEmptyList *fbl; + DRWViewportEmptyList *txl; EDIT_ARMATURE_PassList *psl; EDIT_ARMATURE_StorageList *stl; } EDIT_ARMATURE_Data; -- cgit v1.2.3