diff options
Diffstat (limited to 'source/blender/blenlib/intern/bpath.c')
| -rw-r--r-- | source/blender/blenlib/intern/bpath.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index e23c2658399..b907f77e64c 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -28,7 +28,7 @@ #include "BLI_bpath.h" #include "BKE_global.h" -#include "BIF_screen.h" /* only for wait cursor */ +//XXX #include "BIF_screen.h" /* only for wait cursor */ #include "DNA_ID.h" /* Library */ #include "DNA_vfont_types.h" #include "DNA_image_types.h" @@ -41,12 +41,13 @@ #include "BKE_main.h" /* so we can access G.main->*.first */ #include "BKE_image.h" /* so we can check the image's type */ -#include "blendef.h" #include "BKE_utildefines.h" #include "MEM_guardedalloc.h" /* for sequence */ -#include "BSE_sequence.h" +//XXX #include "BSE_sequence.h" +//XXX define below from BSE_sequence.h - otherwise potentially odd behaviour +#define SEQ_HAS_PATH(seq) (seq->type==SEQ_MOVIE || seq->type==SEQ_HD_SOUND || seq->type==SEQ_RAM_SOUND || seq->type==SEQ_IMAGE) /* for writing to a textblock */ #include "BKE_text.h" @@ -657,7 +658,7 @@ void findMissingFiles(char *str) { char dirname[FILE_MAX], filename[FILE_MAX], filename_new[FILE_MAX]; - waitcursor( 1 ); + //XXX waitcursor( 1 ); BLI_split_dirfile_basic(str, dirname, NULL); @@ -668,9 +669,9 @@ void findMissingFiles(char *str) { libpath = BLI_bpathIterator_getLib(&bpi); /* Check if esc was pressed because searching files can be slow */ - if (blender_test_break()) { + /*XXX if (blender_test_break()) { break; - } + }*/ if (libpath==NULL) { @@ -706,5 +707,5 @@ void findMissingFiles(char *str) { } BLI_bpathIterator_free(&bpi); - waitcursor( 0 ); + //XXX waitcursor( 0 ); } |