diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-18 01:24:39 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-12-18 01:24:39 +0400 |
| commit | 4a92ee2831ae2ae8bf96b116cb47ddcff1c36add (patch) | |
| tree | 9b383957944fa9133fe0e6b3509fc49faaf2d72c /source/blender/editors/space_file | |
| parent | 40f215bbc998a43b991cbdf2fde6e836dc9fabf8 (diff) | |
| parent | 74a112305932eff7c68c23c6df265e72de7195f8 (diff) | |
Merged changes in the trunk up to revision 42692.
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/file_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 69c192b077b..daa2031bb5f 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -715,7 +715,7 @@ int file_draw_check_exists(SpaceFile *sfile) if(RNA_boolean_get(sfile->op->ptr, "check_existing")) { char filepath[FILE_MAX]; BLI_join_dirfile(filepath, sizeof(filepath), sfile->params->dir, sfile->params->file); - if(BLI_exists(filepath) && !BLI_is_dir(filepath)) { + if(BLI_is_file(filepath)) { return TRUE; } } @@ -1143,8 +1143,8 @@ int file_directory_exec(bContext *C, wmOperator *UNUSED(unused)) BLI_dir_create_recursive(sfile->params->dir); } - /* special case, user may have pasted a fulepath into the directory */ - if(BLI_exists(sfile->params->dir) && BLI_is_dir(sfile->params->dir) == 0) { + /* special case, user may have pasted a filepath into the directory */ + if(BLI_is_file(sfile->params->dir)) { char path[sizeof(sfile->params->dir)]; BLI_strncpy(path, sfile->params->dir, sizeof(path)); BLI_split_dirfile(path, sfile->params->dir, sfile->params->file, sizeof(sfile->params->dir), sizeof(sfile->params->file)); |