diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-04-01 17:47:19 +0400 |
| commit | 5524ed9ba2d60331abed47c9df0bc2fcf330b36b (patch) | |
| tree | e8380010f140f022b77236af171d97083a294006 /source/blender/editors/space_buttons | |
| parent | 1360bb6fb0bf0c5c14235c47bf1399accbcecc6f (diff) | |
| parent | 689f3aa174ff795044a4dab719edf60b7b1f5bd3 (diff) | |
Merged changes in the trunk up to revision 55700.
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index dcc61cfa544..cf277957e70 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -120,6 +120,8 @@ static int file_browse_exec(bContext *C, wmOperator *op) BLI_path_abs(path, id ? ID_BLEND_PATH(G.main, id) : G.main->name); if (BLI_is_dir(path)) { + /* do this first so '//' isnt converted to '//\' on windows */ + BLI_add_slash(path); if (is_relative) { BLI_strncpy(path, str, FILE_MAX); BLI_path_rel(path, G.main->name); @@ -129,7 +131,6 @@ static int file_browse_exec(bContext *C, wmOperator *op) else { str = MEM_reallocN(str, strlen(str) + 2); } - BLI_add_slash(str); } else { char * const lslash = (char *)BLI_last_slash(str); |