[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27696] trunk/blender: fix [#21666] selecting images in file browser before thumbnail is created deselects them when the thumb is created
Andrea Weikert
elubie at gmx.net
Tue Mar 23 19:46:22 CET 2010
Revision: 27696
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27696
Author: elubie
Date: 2010-03-23 19:46:21 +0100 (Tue, 23 Mar 2010)
Log Message:
-----------
fix [#21666] selecting images in file browser before thumbnail is created deselects them when the thumb is created
- was overwriting the selection flag
- also fixed mismatching prototype (own eek!)
Also added small update of MSVC 9 projectfiles (blendkernel/image_gen.c)
Modified Paths:
--------------
trunk/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
trunk/blender/source/blender/editors/space_file/filelist.c
Modified: trunk/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- trunk/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2010-03-23 18:28:38 UTC (rev 27695)
+++ trunk/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2010-03-23 18:46:21 UTC (rev 27696)
@@ -647,6 +647,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\image_gen.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\implicit.c"
>
</File>
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2010-03-23 18:28:38 UTC (rev 27695)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2010-03-23 18:46:21 UTC (rev 27696)
@@ -135,7 +135,7 @@
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 @@
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;
More information about the Bf-blender-cvs
mailing list