diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 19:47:05 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 19:47:05 +0400 |
commit | 8dbc7a3ba321ce545c5ebfaa306c62314a38ff48 (patch) | |
tree | 7dc24b3605617c69022bccf6cd87521379626ac1 /source/blender/editors/space_file/filesel.c | |
parent | 8961f24425954c7f6fcaed94f6b0c776a00719ea (diff) | |
parent | d78231734d6ccf224738ea76307c26f8c0d4dab4 (diff) |
Merging r40345 through r40365 from trunk into soc-2011-garlic
Diffstat (limited to 'source/blender/editors/space_file/filesel.c')
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index e3cf795140e..1e113abfcd2 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -376,7 +376,7 @@ float file_shorten_string(char* string, float w, int front) shortened = 1; } if (shortened) { - int slen = strlen(s); + int slen = strlen(s); BLI_strncpy(temp+3, s, slen+1); temp[slen+4] = '\0'; BLI_strncpy(string, temp, slen+4); @@ -393,7 +393,7 @@ float file_shorten_string(char* string, float w, int front) if (shortened) { int slen = strlen(string); if (slen > 3) { - BLI_strncpy(string+slen-3, "...", 4); + BLI_strncpy(string+slen-3, "...", 4); } } } |