[Bf-blender-cvs] [d416e56e70c] master: Fix T54029: Wrong preset name display in win32
Campbell Barton
noreply at git.blender.org
Mon Feb 26 09:07:52 CET 2018
Commit: d416e56e70cf08f0d9ce012df67dce2cb597589d
Author: Campbell Barton
Date: Mon Feb 26 19:05:01 2018 +1100
Branches: master
https://developer.blender.org/rBd416e56e70cf08f0d9ce012df67dce2cb597589d
Fix T54029: Wrong preset name display in win32
===================================================================
M release/scripts/modules/bpy/path.py
===================================================================
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
More information about the Bf-blender-cvs
mailing list