[Bf-blender-cvs] [85ca3156fc3] blender2.8: Cleanup: typedef for empty list

Campbell Barton noreply at git.blender.org
Tue May 2 21:16:16 CEST 2017


Commit: 85ca3156fc3539897789871fbb479ebc6e442fbc
Author: Campbell Barton
Date:   Wed May 3 05:20:58 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB85ca3156fc3539897789871fbb479ebc6e442fbc

Cleanup: typedef for empty list

Without this the intent isn't clear.

===================================================================

M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/modes/edit_armature_mode.c

===================================================================

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;




More information about the Bf-blender-cvs mailing list