From d438b466b75d44f1f80dbd1e0bcc6ae27d083461 Mon Sep 17 00:00:00 2001 From: Benoit Bolsee Date: Mon, 22 Sep 2008 21:15:48 +0000 Subject: Fix file browser for Windows: going to the parent directory introduces ../\. Correct parent is ..\ under Windows. --- source/blender/blenlib/intern/util.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/blenlib') diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c index 1630842be05..d65fe8a476a 100644 --- a/source/blender/blenlib/intern/util.c +++ b/source/blender/blenlib/intern/util.c @@ -1060,13 +1060,18 @@ void BLI_makestringcode(const char *relfile, char *file) int BLI_parent_dir(char *path) { +#ifdef WIN32 + static char *parent_dir="..\\"; +#else + static char *parent_dir="../"; +#endif char tmp[FILE_MAXDIR+FILE_MAXFILE+4]; BLI_strncpy(tmp, path, sizeof(tmp)); BLI_add_slash(tmp); - strcat(tmp, "../"); + strcat(tmp, parent_dir); BLI_cleanup_dir(NULL, tmp); - if (!BLI_testextensie(tmp, "../")) { + if (!BLI_testextensie(tmp, parent_dir)) { BLI_strncpy(path, tmp, sizeof(tmp)); return 1; } else { -- cgit v1.2.3