fix [#21666] selecting images in file browser before thumbnail is created deselects...
authorAndrea Weikert <elubie@gmx.net>
Tue, 23 Mar 2010 18:46:21 +0000 (18:46 +0000)
committerAndrea Weikert <elubie@gmx.net>
Tue, 23 Mar 2010 18:46:21 +0000 (18:46 +0000)
- was overwriting the selection flag
- also fixed mismatching prototype (own eek!)

Also added small update of MSVC 9 projectfiles (blendkernel/image_gen.c)

projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
source/blender/editors/space_file/filelist.c

index c537f4f6f84edced1681a18dee4601cf7d9857a1..470f84f9c6073e3d108cdf1c61f20a40dffc4107 100644 (file)
                                RelativePath="..\..\..\source\blender\blenkernel\intern\image.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\..\source\blender\blenkernel\intern\image_gen.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\source\blender\blenkernel\intern\implicit.c"\r
                                >\r
index 35779970788f2413c6cbdeed3ef3b0e5eb878550..bc12d45b2d67d1181bf5f9468deb4cc9abb11f4a 100644 (file)
@@ -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;