Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-02-18 18:59:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-02-18 19:00:50 +0300
commitf2a21472c4939bf0b5666ec654bbc12bbc6a6e81 (patch)
tree1580664383f3d546ad34f039c290ebece14b5b79 /source/blender/blenkernel/intern/particle.c
parent0e3a2acbfa6998b3a1ec967f3c25f7e12e0cf8fb (diff)
Fix T61473: Crash particle system is updating
Original and localized particle settings were sharing some of the runtime pointers.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r--source/blender/blenkernel/intern/particle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index d7210f28565..5d29c8c5941 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3297,8 +3297,8 @@ void BKE_particlesettings_twist_curve_init(ParticleSettings *part)
void BKE_particlesettings_copy_data(
Main *UNUSED(bmain), ParticleSettings *part_dst, const ParticleSettings *part_src, const int UNUSED(flag))
{
- part_dst->pd = MEM_dupallocN(part_src->pd);
- part_dst->pd2 = MEM_dupallocN(part_src->pd2);
+ part_dst->pd = BKE_partdeflect_copy(part_src->pd);
+ part_dst->pd2 = BKE_partdeflect_copy(part_src->pd2);
part_dst->effector_weights = MEM_dupallocN(part_src->effector_weights);
part_dst->fluid = MEM_dupallocN(part_src->fluid);