diff options
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/BLI_filelist.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 2 | ||||
| m--------- | source/tools | 0 |
5 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject c3348263dc26d6272db88ed94b73caa3ddb3a3f +Subproject 14abe13dc890ba8fc7f78723ad67533ec2146af diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 7cba50c84cd415cbdfc900ee2c4e7b3f59d5214 +Subproject c646ac7c00965d9a117e50a066b777f5691028b diff --git a/source/blender/blenlib/intern/BLI_filelist.c b/source/blender/blenlib/intern/BLI_filelist.c index 3c53d1eee1b..a3b745fd63e 100644 --- a/source/blender/blenlib/intern/BLI_filelist.c +++ b/source/blender/blenlib/intern/BLI_filelist.c @@ -271,7 +271,11 @@ void BLI_filelist_entry_size_to_string(const struct stat *st, * everyone starts using __USE_FILE_OFFSET64 or equivalent. */ double size = (double)(st ? st->st_size : sz); +#ifdef WIN32 + BLI_str_format_byte_unit(r_size, size, false); +#else BLI_str_format_byte_unit(r_size, size, true); +#endif } /** diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index be8ebc18c2c..e54f13e9356 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -639,7 +639,7 @@ static void file_attribute_columns_widths(const FileSelectParams *params, FileLa columns[COLUMN_DATETIME].width = file_string_width(small_size ? "23/08/89" : "23 Dec 6789, 23:59") + pad; - columns[COLUMN_SIZE].width = file_string_width(small_size ? "98.7 M" : "098.7 MB") + pad; + columns[COLUMN_SIZE].width = file_string_width(small_size ? "98.7 M" : "098.7 MiB") + pad; if (params->display == FILE_IMGDISPLAY) { columns[COLUMN_NAME].width = ((float)params->thumbnail_size / 8.0f) * UI_UNIT_X; } diff --git a/source/tools b/source/tools -Subproject 2550eda6bcefad45289acbb4b8e52107e742ce1 +Subproject 7b740545cd039ddcadbfb9bffcac842476eee27 |