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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-09-16 22:07:49 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-09-16 22:07:49 +0400
commit4596f0ee5ea4139ccf3df787df503940a0f8fef2 (patch)
tree4ff56561e7c4ffe5cb55b2b7aefd1ba1cdd90943 /source/blender/editors/space_file/filelist.c
parent615624805129f989a735a9edf20c9f562725063b (diff)
File Browser
* Fix warning for non-existing "relative_paths" property. * Fix problem where the image browser would keep trying to load images it failed opening.
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
-rw-r--r--source/blender/editors/space_file/filelist.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index c0b16e639c0..582a5997ef5 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -592,10 +592,12 @@ void filelist_loadimage_timer(struct FileList* filelist)
}
if (limg->done) {
FileImage *oimg = limg;
- BLI_remlink(&filelist->loadimages, oimg);
BLI_remove_thread(&filelist->threads, oimg);
+ /* brecht: keep failed images in the list, otherwise
+ it keeps trying to load them over and over?
+ BLI_remlink(&filelist->loadimages, oimg);
+ MEM_freeN(oimg);*/
limg = oimg->next;
- MEM_freeN(oimg);
refresh = 1;
} else {
limg= limg->next;