diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-14 03:17:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-14 03:17:35 +0300 |
| commit | 3036a9a46c18758bfae90163e14e3b5d38c2680a (patch) | |
| tree | eba0bfccd53d7526b685019cdd4a1c84df93c011 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 5e8dbafb5b211f9a2c7de5580a7e83254706521b (diff) | |
| parent | c29c426925311eeb79e3988609e914e72b61013b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index cee1c9147b5..d195ce6fa0c 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -172,8 +172,9 @@ void psys_reset(ParticleSystem *psys, int mode) } else if (mode == PSYS_RESET_CACHE_MISS) { /* set all particles to be skipped */ - LOOP_PARTICLES + LOOP_PARTICLES { pa->flag |= PARS_NO_DISP; + } } /* reset children */ @@ -276,8 +277,9 @@ static void realloc_particles(ParticleSimulationData *sim, int new_totpart) psys->totpart=totpart; if (newboids) { - LOOP_PARTICLES + LOOP_PARTICLES { pa->boid = newboids++; + } } } @@ -4143,14 +4145,16 @@ void psys_check_boid_data(ParticleSystem *psys) if (!pa->boid) { bpa = MEM_callocN(psys->totpart * sizeof(BoidParticle), "Boid Data"); - LOOP_PARTICLES + LOOP_PARTICLES { pa->boid = bpa++; + } } } else if (pa->boid) { MEM_freeN(pa->boid); - LOOP_PARTICLES + LOOP_PARTICLES { pa->boid = NULL; + } } } |