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_world_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_world_types.h')
-rw-r--r--source/blender/makesdna/DNA_world_types.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index daf51551b94..161109cdf2d 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -65,7 +65,7 @@ typedef struct World {
* bit 0: Do mist
*/
short mode;
- short pad2[3];
+ char _pad2[6];
float misi, miststa, mistdist, misthi;
@@ -73,11 +73,13 @@ typedef struct World {
float aodist, aoenergy;
/** Assorted settings. */
- short flag, pad3[3];
+ short flag;
+ char _pad3[6];
/** Old animation system, deprecated for 2.5. */
struct Ipo *ipo DNA_DEPRECATED;
- short pr_texture, use_nodes, pad[2];
+ short pr_texture, use_nodes;
+ char _pad[4];
/* previews */
struct PreviewImage *preview;
@@ -86,7 +88,8 @@ typedef struct World {
struct bNodeTree *nodetree;
/** Runtime : miststa + mistdist, used for drawing camera. */
- float mistend, pad1;
+ float mistend;
+ char _pad1[4];
/** Runtime. */
ListBase gpumaterial;
} World;