diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/makesdna/DNA_particle_types.h | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_particle_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 8437c93a722..a7f212a0694 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -97,7 +97,7 @@ typedef struct ParticleData { ParticleKey state; /* current global coordinates */ ParticleKey prev_state; /* previous state */ - + HairKey *hair; /* hair vertices */ ParticleKey *keys; /* keyed keys */ @@ -301,7 +301,7 @@ typedef struct ParticleSystem { struct ListBase targets; /* used for keyed and boid physics */ char name[64]; /* particle system name, MAX_NAME */ - + float imat[4][4]; /* used for duplicators */ float cfra, tree_frame, bvhtree_frame; int seed, child_seed; @@ -387,7 +387,7 @@ typedef enum eParticleDrawFlag { #define PART_UNBORN 32 /*show unborn particles*/ #define PART_DIED 64 /*show died particles*/ -#define PART_TRAND 128 +#define PART_TRAND 128 #define PART_EDISTR 256 /* particle/face from face areas */ #define PART_ROTATIONS 512 /* calculate particle rotations (and store them in pointcache) */ @@ -422,7 +422,7 @@ typedef enum eParticleDrawFlag { #define PART_FROM_VERT 0 #define PART_FROM_FACE 1 #define PART_FROM_VOLUME 2 -/* #define PART_FROM_PARTICLE 3 deprecated! */ +/* #define PART_FROM_PARTICLE 3 deprecated! */ #define PART_FROM_CHILD 4 /* part->distr */ |