diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-11-09 22:30:41 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-11-09 22:37:55 +0300 |
| commit | 7f6521f8dc95f175eb09c77c26f5a3eb3dc7a3c0 (patch) | |
| tree | bcdd384f03c54c8ba8cd0441aca44f2097950d47 /source/blender/blenkernel/intern/object_dupli.cc | |
| parent | 8232cf5287445d21b7d6effb3f0e1ffb6df09adf (diff) | |
Fix T100883: crash with particle instancing and clumping
Properly initialize clump curve mapping tables for duplis and other cases
where this was missed by making a generic init/free function instead of
duplicating the same logic in multiple places. Also fold lattice deform
init into this.
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index a41f7c8bce4..5efd44c620b 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -1390,7 +1390,7 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem RNG *rng = BLI_rng_new_srandom(31415926u + uint(psys->seed)); - psys->lattice_deform_data = psys_create_lattice_deform_data(&sim); + psys_sim_data_init(&sim); /* Gather list of objects or single object. */ int totcollection = 0; @@ -1612,17 +1612,13 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem } BLI_rng_free(rng); + psys_sim_data_free(&sim); } /* Clean up. */ if (oblist) { MEM_freeN(oblist); } - - if (psys->lattice_deform_data) { - BKE_lattice_deform_data_destroy(psys->lattice_deform_data); - psys->lattice_deform_data = nullptr; - } } static void make_duplis_particles(const DupliContext *ctx) |