diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-05-07 01:31:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-07 01:31:16 +0400 |
commit | 730ca20c6324b0761846fbd623ecd39bc5573412 (patch) | |
tree | 5ae734a89da7119a8960454997415af4f117c684 /source/blender/blenkernel | |
parent | 9610515b22dcf0450aca9c3794700380851753a9 (diff) |
fix for duplicating cloth which could crash on freeing
- effector list wasnt NULL'd on copying a particle system
- copying an object would initialize the cloth modifier, then copy it, witout freeing its effector weights created in cloth_init().
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index baa1caee49b..24c23e5ea41 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1140,12 +1140,13 @@ ParticleSystem *copy_particlesystem(ParticleSystem *psys) } BLI_duplicatelist(&psysn->targets, &psys->targets); - + psysn->pathcache= NULL; psysn->childcache= NULL; psysn->edit= NULL; psysn->frand= NULL; psysn->pdd= NULL; + psysn->effectors= NULL; psysn->pathcachebufs.first = psysn->pathcachebufs.last = NULL; psysn->childcachebufs.first = psysn->childcachebufs.last = NULL; |