diff options
| author | Matt Ebb <matt@mke3.net> | 2010-06-09 06:42:20 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-06-09 06:42:20 +0400 |
| commit | 1c693079a212a85b6d380ce06bf1bba27b3b6de8 (patch) | |
| tree | 76dd91fe9c1ce909e1ec63b362629a4860a60157 /source/blender/blenloader | |
| parent | 23d68fed88fa69b41d4a5c64d4ad7c9c5626bdbf (diff) | |
Fix [#22538] Crash when Selecting Particle Properties Tab (File-dependant)
psys->parent pointer wasn't getting handled in lib_link_particlesystems()
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b9be5e66106..3ec253f1003 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3074,6 +3074,7 @@ static void lib_link_particlesystems(FileData *fd, Object *ob, ID *id, ListBase for(; pt; pt=pt->next) pt->ob=newlibadr(fd, id->lib, pt->ob); + psys->parent= newlibadr_us(fd, id->lib, psys->parent); psys->target_ob = newlibadr(fd, id->lib, psys->target_ob); if(psys->clmd) { @@ -3143,7 +3144,7 @@ static void direct_link_particlesystems(FileData *fd, ListBase *particles) psys->childcachebufs.first = psys->childcachebufs.last = NULL; psys->frand = NULL; psys->pdd = NULL; - + direct_link_pointcache_list(fd, &psys->ptcaches, &psys->pointcache); if(psys->clmd) { |