From 6a03199b50e02d57a50eb24441ef7be0b7e965ac Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 27 Feb 2019 15:07:50 +1100 Subject: Cleanup: use '_pad' convention for padding in all DNA structs Avoids mixing these in with regular variables in code-completion. Use char for pad members except for 'void *', to make size clearer. Removed/shrink a few redundant padding vars which were >= 8 bytes. --- source/blender/makesdna/DNA_view3d_types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/makesdna/DNA_view3d_types.h') diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 78bebd0b654..2491e2cb0e0 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -115,7 +115,7 @@ typedef struct RegionView3D { char viewlock; /** Options for quadview (store while out of quad view). */ char viewlock_quad; - char pad[3]; + char _pad[3]; /** Normalized offset for locked view: (-1, -1) bottom left, (1, 1) upper right. */ float ofs_lock[2]; @@ -160,7 +160,7 @@ typedef struct View3DShading { char background_type; char cavity_type; char wire_color_type; - char pad[6]; + char _pad[6]; /** FILE_MAXFILE. */ char studio_light[256]; @@ -306,14 +306,14 @@ typedef struct View3D { /* Stereoscopy settings */ short stereo3d_flag; char stereo3d_camera; - char pad4; + char _pad4; float stereo3d_convergence_factor; float stereo3d_volume_alpha; float stereo3d_convergence_alpha; /* Display settings */ short drawtype DNA_DEPRECATED; - short pad5[3]; + char _pad5[6]; View3DShading shading; View3DOverlay overlay; -- cgit v1.2.3