Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-02-26 11:05:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-26 11:05:01 +0300
commitd416e56e70cf08f0d9ce012df67dce2cb597589d (patch)
tree113a1e06781bd05d08f7ce0319b8852bcedd6043 /release
parentb1414b7322b5510a16cefbf1ac8f227d49f26d34 (diff)
Fix T54029: Wrong preset name display in win32
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/bpy/path.py5
1 files changed, 4 insertions, 1 deletions
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