diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-26 13:52:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-26 13:52:55 +0300 |
| commit | 666cca69e90bf1f5c1bfb5a6582c56c2e8311f04 (patch) | |
| tree | 5d467cc4e8e6163f094353369783c79ccc4b59d9 /source/blender/blenloader | |
| parent | 05b1f00858313930b8a850aff6349bb6ab68efff (diff) | |
Cloth simulation can now use a group to specify which objects
to collide with, in addition to the effectors group.
(commit 27746 by Brecht from render25 branch)
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 768fe1f2c33..356ae158692 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3065,6 +3065,7 @@ static void lib_link_particlesystems(FileData *fd, Object *ob, ID *id, ListBase * pointcache should /w cloth should be added in 'ParticleSystem' - campbell */ psys->clmd->point_cache= psys->pointcache; psys->clmd->ptcaches.first= psys->clmd->ptcaches.last= NULL; + psys->clmd->coll_parms->group= newlibadr(fd, id->lib, psys->clmd->coll_parms->group); } } else { @@ -3621,6 +3622,7 @@ static void lib_link_object(FileData *fd, Main *main) if(clmd) { clmd->sim_parms->effector_weights->group = newlibadr(fd, ob->id.lib, clmd->sim_parms->effector_weights->group); + clmd->coll_parms->group= newlibadr(fd, ob->id.lib, clmd->coll_parms->group); } } |