diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 19:11:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 19:11:03 +0400 |
| commit | b56aabf815dd60827da81574501ea1d12ce3a38b (patch) | |
| tree | c8e49d9265437377584cb28705a2dc466a7faa1e /source/blender/blenkernel/intern/particle.c | |
| parent | 8765dfccf725770007e3b4e6b24199fe8377df71 (diff) | |
style cleanup: multi-line if statements.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 2eff664bc1a..414677bfc6e 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4276,10 +4276,13 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta state->time = psys_get_child_time(psys, cpa, cfra, NULL, NULL); - if (!always) - if ((state->time < 0.0f && !(part->flag & PART_UNBORN)) - || (state->time > 1.0f && !(part->flag & PART_DIED))) + if (!always) { + if ((state->time < 0.0f && !(part->flag & PART_UNBORN)) || + (state->time > 1.0f && !(part->flag & PART_DIED))) + { return 0; + } + } state->time= (cfra - (part->sta + (part->end - part->sta) * PSYS_FRAND(p + 23))) / (part->lifetime * PSYS_FRAND(p + 24)); @@ -4296,10 +4299,13 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta } if (pa) { - if (!always) - if ((cfra < pa->time && (part->flag & PART_UNBORN)==0) - || (cfra > pa->dietime && (part->flag & PART_DIED)==0)) + if (!always) { + if ((cfra < pa->time && (part->flag & PART_UNBORN) == 0) || + (cfra > pa->dietime && (part->flag & PART_DIED) == 0)) + { return 0; + } + } cfra = MIN2(cfra, pa->dietime); } |