diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:38:39 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:38:39 +0300 |
| commit | b22a38786df7c3c7a785393bcca03f6b3b7c620a (patch) | |
| tree | 0d436c71f5816f944038aef0201892eb583e4fee /source/blender/makesdna | |
| parent | c8912073e62d503f9caa645963a282228c3af4f2 (diff) | |
Fixed merge errors.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 04408196b56..95cb5c84bed 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -218,7 +218,7 @@ typedef struct ParticleSettings { /* kink */ float kink_amp, kink_freq, kink_shape, kink_flat; float kink_amp_clump; - int kink_extra_steps, pad; + int kink_extra_steps, pad4; float kink_axis_random, kink_amp_random; /* rough */ float rough1, rough1_size; @@ -257,7 +257,7 @@ typedef struct ParticleSettings { /* modified dm support */ short use_modifier_stack; - short pad[3]; + short pad5[3]; } ParticleSettings; |