[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34458] trunk/blender/source/blender/ blenloader/intern/readfile.c: Bug fix: pre 2. 5 particles that were using old memory caching didn't load properly
Janne Karhu
jhkarh at gmail.com
Sat Jan 22 22:13:29 CET 2011
Revision: 34458
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34458
Author: jhk
Date: 2011-01-22 21:13:29 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
Bug fix: pre 2.5 particles that were using old memory caching didn't load properly
* Now the old cache is just freed so that new calculations can be done.
* The particle dynamics regression test files should display correctly now.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-01-22 20:38:27 UTC (rev 34457)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-01-22 21:13:29 UTC (rev 34458)
@@ -8867,9 +8867,13 @@
ob->soft->pointcache= BKE_ptcache_add(&ob->soft->ptcaches);
for(psys=ob->particlesystem.first; psys; psys=psys->next) {
- //if(psys->soft && !psys->soft->pointcache)
- // psys->soft->pointcache= BKE_ptcache_add(&psys->soft->ptcaches);
- if(!psys->pointcache)
+ if(psys->pointcache) {
+ if(psys->pointcache->flag & PTCACHE_BAKED && (psys->pointcache->flag & PTCACHE_DISK_CACHE)==0) {
+ printf("Old memory cache isn't supported for particles, so re-bake the simulation!\n");
+ psys->pointcache->flag &= ~PTCACHE_BAKED;
+ }
+ }
+ else
psys->pointcache= BKE_ptcache_add(&psys->ptcaches);
}
More information about the Bf-blender-cvs
mailing list