archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T54029: Wrong preset name display in win32

Browse Source
This commit is contained in:
Campbell Barton
2018-02-26 19:05:01 +11:00
parent b1414b7322
commit d416e56e70
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/modules/bpy/path.py
View File

@@ -187,7 +187,6 @@ clean_name._trans_cache = {}
def _clean_utf8(name): def _clean_utf8(name):
name = _os.path.splitext(basename(name))[0]
if type(name) == bytes: if type(name) == bytes:
return name.decode("utf8", "replace") return name.decode("utf8", "replace")
else: else:
@@ -207,6 +206,9 @@ def display_name(name):
mixed case names are kept as is. Intended for use with mixed case names are kept as is. Intended for use with
filenames and module names. filenames and module names.
""" """
name = _os.path.splitext(basename(name))[0]
# string replacements # string replacements
for disp_value, file_value in _display_name_literals.items(): for disp_value, file_value in _display_name_literals.items():
name = name.replace(file_value, disp_value) name = name.replace(file_value, disp_value)
@@ -237,6 +239,7 @@ def display_name_from_filepath(name):
ensured to be utf8 compatible. ensured to be utf8 compatible.
""" """
name = _os.path.splitext(basename(name))[0]
name = _clean_utf8(name) name = _clean_utf8(name)
return name return name