diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-04 14:13:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-04 14:13:49 +0300 |
| commit | f23ed929ee021e11e8d47973d25f9039e9f91c17 (patch) | |
| tree | 32cd0f2a4dbb59a639a9523a72e0211fb69bd98b /source/blender/makesdna/DNA_particle_types.h | |
| parent | fc8f6e8f7a3fcc3b17ee7db6291fb9dcb71dc185 (diff) | |
| parent | f86b43e130cb0a1d5a460cc72bcd979c479215bc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/makesdna/DNA_particle_types.h
Diffstat (limited to 'source/blender/makesdna/DNA_particle_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index cde8eef6ef3..d0dfe18d0c4 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -324,7 +324,7 @@ typedef struct ParticleSystem { struct ParticleDrawData *pdd; float dt_frac; /* current time step, as a fraction of a frame */ - float _pad; /* spare capacity */ + float lattice_strength; /* influence of the lattice modifier */ void *batch_cache; } ParticleSystem; |