Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-27 07:07:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-27 07:09:48 +0300
commit6a03199b50e02d57a50eb24441ef7be0b7e965ac (patch)
treea5e5374cb81742d2c2df05ecf315afaafcaf3d0e /source/blender/makesdna/DNA_mesh_types.h
parentea69d9858058e027a8b49d0cf313c8d4abb777a4 (diff)
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.
Diffstat (limited to 'source/blender/makesdna/DNA_mesh_types.h')
-rw-r--r--source/blender/makesdna/DNA_mesh_types.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index b018710669b..956fee97d40 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -79,9 +79,9 @@ typedef struct Mesh_Runtime {
void *batch_cache;
struct SubdivCCG *subdiv_ccg;
- void *pad1;
+ void *_pad1;
int subdiv_ccg_tot_level;
- int pad2;
+ char _pad2[4];
int64_t cd_dirty_vert;
int64_t cd_dirty_edge;
@@ -103,7 +103,7 @@ typedef struct Mesh_Runtime {
* In the future we may leave the mesh-data empty
* since its not needed if we can use edit-mesh data. */
char is_original;
- char padding[6];
+ char _pad[6];
} Mesh_Runtime;
typedef struct Mesh {
@@ -178,7 +178,7 @@ typedef struct Mesh {
float smoothresh;
/* customdata flag, for bevel-weight and crease, which are now optional */
- char cd_flag, pad;
+ char cd_flag, _pad;
char subdiv DNA_DEPRECATED, subdivr DNA_DEPRECATED;
/** Only kept for backwards compat, not used anymore. */