diff --git a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj index c537f4f6f84..470f84f9c60 100644 --- a/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj +++ b/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj @@ -646,6 +646,10 @@ RelativePath="..\..\..\source\blender\blenkernel\intern\image.c" > + + diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 35779970788..bc12d45b2d6 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -135,7 +135,7 @@ typedef struct FileList short hide_parent; void (*readf)(struct FileList *); - int (*filterf)(struct FileList *, struct direntry* file, unsigned int filter, short hide_dot); + int (*filterf)(struct direntry* file, const char* dir, unsigned int filter, short hide_dot); } FileList; @@ -1309,7 +1309,11 @@ static void thumbnails_update(void *tjv) while (limg) { if (!limg->done && limg->img) { tj->filelist->filelist[limg->index].image = limg->img; - tj->filelist->filelist[limg->index].flags = limg->flags; + /* update flag for movie files where thumbnail can't be created */ + if (limg->flags & MOVIEFILE_ICON) { + tj->filelist->filelist[limg->index].flags &= ~MOVIEFILE; + tj->filelist->filelist[limg->index].flags |= MOVIEFILE_ICON; + } limg->done=1; } limg = limg->next;