Page MenuHome
Differential D1213 Diff 3876 source/blender/blenkernel/intern/particle_system.c

Changeset View

Standalone View

View Options

source/blender/blenkernel/intern/particle_system.c

Context not available.
ParticleSystem *psys = sim->psys; ParticleSystem *psys = sim->psys;
PARTICLE_P; PARTICLE_P;
LOOP_PARTICLES{
initialize_particle(sim, pa);
}
}
static void free_unexisting_particles(ParticleSimulationData *sim)
{
ParticleSystem *psys = sim->psys;
PARTICLE_P;
psys->totunexist = 0; psys->totunexist = 0;
LOOP_PARTICLES { LOOP_PARTICLES {
if ((pa->flag & PARS_UNEXIST)==0) if (pa->flag & PARS_UNEXIST) {
initialize_particle(sim, pa);
if (pa->flag & PARS_UNEXIST)
psys->totunexist++; psys->totunexist++;
}
} }
/* Free unexisting particles. */
if (psys->totpart && psys->totunexist == psys->totpart) { if (psys->totpart && psys->totunexist == psys->totpart) {
if (psys->particles->boid) if (psys->particles->boid)
MEM_freeN(psys->particles->boid); MEM_freeN(psys->particles->boid);
Context not available.
initialize_all_particles(sim); initialize_all_particles(sim);
/* reset only just created particles (on startframe all particles are recreated) */ /* reset only just created particles (on startframe all particles are recreated) */
reset_all_particles(sim, 0.0, cfra, oldtotpart); reset_all_particles(sim, 0.0, cfra, oldtotpart);
free_unexisting_particles(sim);
if (psys->fluid_springs) { if (psys->fluid_springs) {
MEM_freeN(psys->fluid_springs); MEM_freeN(psys->fluid_springs);
Context not available.
free_keyed_keys(psys); free_keyed_keys(psys);
distribute_particles(&sim, part->from); distribute_particles(&sim, part->from);
initialize_all_particles(&sim); initialize_all_particles(&sim);
free_unexisting_particles(&sim);
brechtUnsubmitted
Not Done
Inline Actions

I think this still needs to happen after the loop below where it does reset_particle which sets PARS_UNEXIST through initialize_particle_texture.

Something like this:

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 54d01ea..645f403 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4143,6 +4143,7 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
                                {
                                        PARTICLE_P;
                                        float disp = psys_get_current_display_percentage(psys);
+                                       bool free_unexisting = false;

                                        /* Particles without dynamics haven't been reset yet because they don't use pointcache */
                                        if (psys->recalc & PSYS_RECALC_RESET)
@@ -4152,7 +4153,7 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
                                                free_keyed_keys(psys);
                                                distribute_particles(&sim, part->from);
                                                initialize_all_particles(&sim);
-                                               free_unexisting_particles(&sim);
+                                               free_unexisting = true;

                                                /* flag for possible explode modifiers after this system */
                                                sim.psmd->flag |= eParticleSystemFlag_Pars;
@@ -4171,6 +4172,10 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys)
                                                        pa->flag &= ~PARS_NO_DISP;
                                        }

+                                       /* free unexisting after reset particle */
+                                       if (free_unexisting)
+                                               free_unexisting_particles(&sim);
+
                                        if (part->phystype == PART_PHYS_KEYED) {
                                                psys_count_keyed_targets(&sim);
                                                set_keyed_keys(&sim);
brecht: I think this still needs to happen after the loop below where it does `reset_particle` which…
/* flag for possible explode modifiers after this system */ /* flag for possible explode modifiers after this system */
sim.psmd->flag |= eParticleSystemFlag_Pars; sim.psmd->flag |= eParticleSystemFlag_Pars;
Context not available.