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_shader_fx_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_shader_fx_types.h')
-rw-r--r--source/blender/makesdna/DNA_shader_fx_types.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h
index 342c2be9d17..54922d78fae 100644
--- a/source/blender/makesdna/DNA_shader_fx_types.h
+++ b/source/blender/makesdna/DNA_shader_fx_types.h
@@ -63,7 +63,7 @@ typedef struct ShaderFxData {
int type, mode;
int stackindex;
short flag;
- short pad;
+ char _pad[2];
/** MAX_NAME. */
char name[64];
@@ -90,7 +90,7 @@ typedef struct BlurShaderFxData {
float coc;
/** Not visible in rna. */
int blur[2];
- char pad[4];
+ char _pad[4];
ShaderFxData_Runtime runtime;
} BlurShaderFxData;
@@ -107,7 +107,7 @@ typedef struct ColorizeShaderFxData {
float factor;
/** Flags. */
int flag;
- char pad[4];
+ char _pad[4];
ShaderFxData_Runtime runtime;
} ColorizeShaderFxData;
@@ -165,7 +165,7 @@ typedef struct LightShaderFxData {
float ambient;
/** Internal, not visible in rna. */
float loc[4];
- char pad[4];
+ char _pad[4];
ShaderFxData_Runtime runtime;
} LightShaderFxData;
@@ -193,7 +193,7 @@ typedef struct RimShaderFxData {
int mode;
int blur[2];
int samples;
- char pad[4];
+ char _pad[4];
ShaderFxData_Runtime runtime;
} RimShaderFxData;
@@ -221,7 +221,7 @@ typedef struct ShadowShaderFxData {
float rotation;
int blur[2];
int samples;
- char pad[4];
+ char _pad[4];
ShaderFxData_Runtime runtime;
} ShadowShaderFxData;
@@ -254,7 +254,7 @@ typedef struct WaveShaderFxData {
int orientation;
/** Flags. */
int flag;
- char pad[4];
+ char _pad[4];
ShaderFxData_Runtime runtime;
} WaveShaderFxData;
#endif /* __DNA_SHADER_FX_TYPES_H__ */