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:
authorCampbell Barton <ideasman42@gmail.com>2010-02-04 19:54:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-04 19:54:25 +0300
commiteedf5cbe89826faa728cf90d935cc696dd79b045 (patch)
tree9b99b27c44ecd63bfdd32804c58224d22794e3eb /source/blender/blenloader
parenteaca7fa8b573c08fb724082a923775ac2004651e (diff)
reading in hair with dynamics wasnt working but mostly crashed when duplicating the object.
from reading all places dynamic hair is used I think these changes are correct (cloth seems to share pointcache with the psys) but its not obvious. jahka: please check this is ok.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 051bc1851b8..e9cbbb95b02 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3187,6 +3187,13 @@ static void lib_link_particlesystems(FileData *fd, Object *ob, ID *id, ListBase
pt->ob=newlibadr(fd, id->lib, pt->ob);
psys->target_ob = newlibadr(fd, id->lib, psys->target_ob);
+
+ if(psys->clmd) {
+ /* XXX - from reading existing code this seems correct but intended usage of
+ * 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;
+ }
}
else {
/* particle modifier must be removed before particle system */