diff options
| author | Martin Poirier <theeth@yahoo.com> | 2005-07-27 10:21:50 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2005-07-27 10:21:50 +0400 |
| commit | fe30da17755e3cfc0cb976d277288fcf40913b23 (patch) | |
| tree | dbaf995f91e2698948821a4c56a259594bcafc1c /source/blender | |
| parent | c25b7117d0235963f4949bc141b9f0a91479e80f (diff) | |
Image memory garbage collection wasn't working correctly due to a poorly constructed if clause (it was collecting only images marked as NO_COLLECT, which only happens with Python loaded images).
Another problem now is that the userpref values aren't correctly saved in .b.blend, they always reset to the default. Will look into that.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index a41f214d0b9..eb5c8f58b7a 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -181,8 +181,7 @@ void free_old_images() ima= G.main->image.first; while(ima) { - /* lastused == 0 is the tag for non removable images */ - if(ima->flag & IMA_NOCOLLECT && ctime - ima->lastused > U.textimeout) { + if((ima->flag & IMA_NOCOLLECT)==0 && ctime - ima->lastused > U.textimeout) { /* If it's in GL memory, deallocate and set time tag to current time This gives textures a "second chance" to be used before dying. |