Revision: 23281
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23281
Author: blendix
Date: 2009-09-16 20:07:49 +0200 (Wed, 16 Sep 2009)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filelist.c
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2009-09-16
18:05:28 UTC (rev 23280)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2009-09-16
18:07:49 UTC (rev 23281)
@@ -531,9 +531,10 @@
RNA_string_set(op->ptr, "directory", name);
strcat(name, sfile->params->file);
- if ( RNA_boolean_get(op->ptr, "relative_paths") ) {
- BLI_makestringcode(G.sce, name);
- }
+ if(RNA_struct_find_property(op->ptr, "relative_paths"))
+ if(RNA_boolean_get(op->ptr, "relative_paths"))
+ BLI_makestringcode(G.sce, name);
+
RNA_string_set(op->ptr, "path", name);
/* some ops have multiple files to select */
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2009-09-16
18:05:28 UTC (rev 23280)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2009-09-16
18:07:49 UTC (rev 23281)
@@ -592,10 +592,12 @@
}
if (limg->done) {
FileImage *oimg = limg;
+ 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);
- BLI_remove_thread(&filelist->threads, oimg);
+ MEM_freeN(oimg);*/
limg = oimg->next;
- MEM_freeN(oimg);
refresh = 1;
} else {
limg= limg->next;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
