diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
| commit | 189c2e9277d4abd3b750a5a60ef42549dcfe359d (patch) | |
| tree | 1430a845f4aab56b9133c3d8c6ffac09ee6dd92a /source/blender/blenlib/intern/path_util.c | |
| parent | 771bad9c6abaad4b742935e5d55067f281287650 (diff) | |
| parent | 1519b6a23e0341e25bf5a5c714f9f3d119ab8781 (diff) | |
Merge branch 'master' into soc-2014-viewport_contextsoc-2014-viewport_context
Diffstat (limited to 'source/blender/blenlib/intern/path_util.c')
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index a7fa443cfc4..d5af980e373 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -873,9 +873,12 @@ bool BLI_path_abs(char *path, const char *basepath) char tmp[FILE_MAX]; char base[FILE_MAX]; #ifdef WIN32 - char vol[3] = {'\0', '\0', '\0'}; - BLI_strncpy(vol, path, 3); + /* without this: "" --> "C:\" */ + if (*path == '\0') { + return wasrelative; + } + /* we are checking here if we have an absolute path that is not in the current * blend file as a lib main - we are basically checking for the case that a * UNIX root '/' is passed. |