[Bf-blender-cvs] [d1f7ae29a20] master: Cleanup: use "_pad" prefix for pad vars
Campbell Barton
noreply at git.blender.org
Wed Feb 27 12:21:02 CET 2019
Commit: d1f7ae29a20ab07626cd45d38f6e3be60eaa3f15
Author: Campbell Barton
Date: Wed Feb 27 22:20:29 2019 +1100
Branches: master
https://developer.blender.org/rBd1f7ae29a20ab07626cd45d38f6e3be60eaa3f15
Cleanup: use "_pad" prefix for pad vars
===================================================================
M source/blender/makesdna/DNA_light_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_light_types.h b/source/blender/makesdna/DNA_light_types.h
index b2bbb56c12c..ec913aa2b48 100644
--- a/source/blender/makesdna/DNA_light_types.h
+++ b/source/blender/makesdna/DNA_light_types.h
@@ -52,7 +52,8 @@ typedef struct Light {
/** Quad1 and Quad2 attenuation. */
float att1, att2;
- float coeff_const, coeff_lin, coeff_quad, coeff_pad;
+ float coeff_const, coeff_lin, coeff_quad;
+ char _pad0[4];
struct CurveMapping *curfalloff;
short falloff_type;
char _pad2[2];
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index cc0c4cd6f4c..dc6e9dd05a1 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -217,7 +217,8 @@ typedef struct ParticleSettings {
float timetweak, courant_target;
float jitfac, eff_hair, grid_rand, ps_offset[1];
int totpart, userjit, grid_res, effector_amount;
- short time_flag, time_pad[3];
+ short time_flag;
+ char _pad0[6];
/* initial velocity factors */
float normfac, obfac, randfac, partfac, tanfac, tanphase, reactfac;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 6c99c74f055..5e1f4304389 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -158,7 +158,7 @@ typedef struct FFMpegCodecData {
int audio_bitrate;
int audio_mixrate;
int audio_channels;
- int audio_pad;
+ char _pad0[4];
float audio_volume;
int gop_size;
/** Only used if FFMPEG_USE_MAX_B_FRAMES flag is set. */
More information about the Bf-blender-cvs
mailing list