diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-04 12:59:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-04 12:59:05 +0300 |
| commit | b7e3862b55e169e0fc7bb0bb77e7560f31ffa106 (patch) | |
| tree | 4698aa31a1652a96d83bf0c095e432b15f462c14 /source/blender/blenkernel | |
| parent | 843b0e343b96e6f59510f65f811fd6de4b83117d (diff) | |
fix for crash when deleting duplictaed objects with particle systems
cloth modifier was copied but not assigned to the new psys.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 42fe565f1bb..0baf9b00ecf 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1145,8 +1145,8 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys) } if(psys->clmd) { - ClothModifierData *nclmd = (ClothModifierData *)modifier_new(eModifierType_Cloth); - modifier_copyData((ModifierData*)psys->clmd, (ModifierData*)nclmd); + psysn->clmd = (ClothModifierData *)modifier_new(eModifierType_Cloth); + modifier_copyData((ModifierData*)psys->clmd, (ModifierData*)psysn->clmd); psys->hair_in_dm = psys->hair_out_dm = NULL; } |