kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#21666] selecting images in file browser before thumbnail is created deselects them when the thumb is created

Browse Source 
- was overwriting the selection flag
- also fixed mismatching prototype (own eek!)

Also added small update of MSVC 9 projectfiles (blendkernel/image_gen.c)
This commit is contained in:
Andrea Weikert 2010-03-23 18:46:21 +00:00
parent 737eee5d1b
commit 411cc8e5b6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
View File

@ -646,6 +646,10 @@
RelativePath="..\..\..\source\blender\blenkernel\intern\image.c"
>
</File>
<File
RelativePath="..\..\..\source\blender\blenkernel\intern\image_gen.c"
>
</File>
<File
RelativePath="..\..\..\source\blender\blenkernel\intern\implicit.c"
>

8
source/blender/editors/space_file/filelist.c
View 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;