diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 01:08:30 +0300 |
| commit | 66738d4aa017203caff067c41e25e28d62c3fd0b (patch) | |
| tree | dee20ce0b0b6293812eeb76be279d9103297d60b /source/blender/blenkernel/BKE_particle.h | |
| parent | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (diff) | |
| parent | 2083a7e274fefd4c82c8c52df87bc175e453c628 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 4374046d701..aa00024b27b 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -67,7 +67,7 @@ struct ViewLayer; #define PARTICLE_COLLISION_MAX_COLLISIONS 10 -#define PARTICLE_P ParticleData * pa; int p +#define PARTICLE_P ParticleData *pa; int p #define LOOP_PARTICLES for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) #define LOOP_EXISTING_PARTICLES for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) if (!(pa->flag & PARS_UNEXIST)) #define LOOP_SHOWN_PARTICLES for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) if (!(pa->flag & (PARS_UNEXIST | PARS_NO_DISP))) @@ -75,7 +75,7 @@ struct ViewLayer; #define LOOP_DYNAMIC_PARTICLES for (p = 0; p < psys->totpart; p++) if ((pa = psys->particles + p)->state.time > 0.0f) /* fast but sure way to get the modifier*/ -#define PARTICLE_PSMD ParticleSystemModifierData * psmd = sim->psmd ? sim->psmd : psys_get_modifier(sim->ob, sim->psys) +#define PARTICLE_PSMD ParticleSystemModifierData *psmd = sim->psmd ? sim->psmd : psys_get_modifier(sim->ob, sim->psys) /* common stuff that many particle functions need */ typedef struct ParticleSimulationData { |