diff options
author | Andrea Weikert <elubie@gmx.net> | 2006-08-20 18:41:13 +0400 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2006-08-20 18:41:13 +0400 |
commit | ffe630b452f4abb28c105fca2b8eb9fdb6e72370 (patch) | |
tree | 82f27ea61114c3d66ec8f5bacc393b96af8df12c /source/blender/src/usiblender.c | |
parent | 8dd3a792f09a3c1c495c38a37a73c219a8ff02fb (diff) |
Fixes for:
[ #4337 ] Cant refresh the C:\
[ #4710 ] Wrong paths in file selector under user prefs
[ #4353 ] Using ^ char + click on Open/Load = Blender crash
Details:
Fixes for root paths like C:\ on Windows, where Blender still used '/'.
Also contains fixes for relative paths:
- no relative paths for the default dirs (forced to absolute)
- message if using relative paths when .blend file hasn't been saved.
Lastly also added '.' for refresh in root paths. Windows
FindFirstFile/FindNextFile also return '.' and '..', but not in root paths like C:\
Diffstat (limited to 'source/blender/src/usiblender.c')
-rw-r--r-- | source/blender/src/usiblender.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 381a8482371..27f2248d985 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -368,6 +368,8 @@ void BIF_read_file(char *name) if(retval==2) init_userdef_file(); // in case a userdef is read from regular .blend + G.relbase_valid = 1; + undo_editmode_clear(); BKE_reset_undo(); BKE_write_undo("original"); /* save current state */ @@ -417,6 +419,7 @@ int BIF_read_homefile(void) } BLI_freelistN(&G.ttfdata); + G.relbase_valid = 0; BLI_make_file_string(G.sce, tstr, home, ".B.blend"); strcpy(scestr, G.sce); /* temporal store */ @@ -558,7 +561,7 @@ static void readBlog(void) fsmenu_append_seperator(); /* add last saved file */ - BLI_split_dirfile(G.sce, name, filename); + BLI_split_dirfile(G.sce, name, filename); /* G.sce shouldn't be relative */ fsmenu_insert_entry(name, 0); @@ -683,6 +686,7 @@ void BIF_write_file(char *target) if (BLO_write_file(di, writeflags, &err)) { strcpy(G.sce, di); + G.relbase_valid = 1; strcpy(G.main->name, di); /* is guaranteed current file */ mainwindow_set_filename_to_title(G.main->name); |