From d416e56e70cf08f0d9ce012df67dce2cb597589d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Feb 2018 19:05:01 +1100 Subject: Fix T54029: Wrong preset name display in win32 --- release/scripts/modules/bpy/path.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'release/scripts/modules/bpy') diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index 0bfb14e4e0d..a88e60d0022 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -187,7 +187,6 @@ clean_name._trans_cache = {} def _clean_utf8(name): - name = _os.path.splitext(basename(name))[0] if type(name) == bytes: return name.decode("utf8", "replace") else: @@ -207,6 +206,9 @@ def display_name(name): mixed case names are kept as is. Intended for use with filenames and module names. """ + + name = _os.path.splitext(basename(name))[0] + # string replacements for disp_value, file_value in _display_name_literals.items(): name = name.replace(file_value, disp_value) @@ -237,6 +239,7 @@ def display_name_from_filepath(name): ensured to be utf8 compatible. """ + name = _os.path.splitext(basename(name))[0] name = _clean_utf8(name) return name -- cgit v1.2.3