diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 13:11:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 13:11:55 +0300 |
commit | f06884b18ab5b619975689a0670f8f0f14f9c318 (patch) | |
tree | e0c0f557659f6b900019acd5c1f11e127619e539 /source/blender/makesdna | |
parent | b2193e020bc0c1a9ef9969440ece453e49f8012c (diff) |
Cleanup: style, duplicate includes
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_modifier_types.h | 8 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_shader_fx_types.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index 150b4a2d9f1..1e3a4bf09f0 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -18,12 +18,12 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file DNA_greasepencil_modifier_types.h +/** \file DNA_gpencil_modifier_types.h * \ingroup DNA */ -#ifndef __DNA_GREASEPENCIL_TYPES_H__ -#define __DNA_GREASEPENCIL_TYPES_H__ +#ifndef __DNA_GPENCIL_MODIFIER_TYPES_H__ +#define __DNA_GPENCIL_MODIFIER_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" @@ -401,4 +401,4 @@ typedef enum eSmoothGpencil_Flag { #define MOD_MESHSEQ_READ_ALL \ (MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR) -#endif /* __DNA_GREASEPENCIL_TYPES_H__ */ +#endif /* __DNA_GPENCIL_MODIFIER_TYPES_H__ */ diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h index 15147cf2b6c..f3c9f06c8dc 100644 --- a/source/blender/makesdna/DNA_shader_fx_types.h +++ b/source/blender/makesdna/DNA_shader_fx_types.h @@ -22,8 +22,8 @@ * \ingroup DNA */ -#ifndef __DNA_SHADERFX_TYPES_H__ -#define __DNA_SHADERFX_TYPES_H__ +#ifndef __DNA_SHADER_FX_TYPES_H__ +#define __DNA_SHADER_FX_TYPES_H__ #include "DNA_defs.h" #include "DNA_listBase.h" @@ -130,7 +130,7 @@ typedef struct LightShaderFxData { int flag; /* flags */ float energy; float ambient; - float loc[4]; /* internal, not visible in rna */ + float loc[4]; /* internal, not visible in rna */ char pad[4]; ShaderFxData_runtime runtime; } LightShaderFxData; @@ -193,4 +193,4 @@ typedef struct WaveShaderFxData { char pad[4]; ShaderFxData_runtime runtime; } WaveShaderFxData; -#endif /* __DNA_SHADERFX_TYPES_H__ */ +#endif /* __DNA_SHADER_FX_TYPES_H__ */ |