diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-27 00:49:30 +0300 |
| commit | f228a08d027ef700344d35f1ba958249afa93222 (patch) | |
| tree | fc6c60d89f911bcb0c5019e2e6e4243e49cba9af /release | |
| parent | e94276d4033c72000942a49100e552e800d09e58 (diff) | |
| parent | 7dd0e36dc4582e57a3f5235f384b5207882c923e (diff) | |
merge from master
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/bpy/path.py | 5 | ||||
| -rw-r--r-- | release/scripts/presets/camera/1_colon_2.3_inch.py (renamed from release/scripts/presets/camera/1__colon__2.3_inch.py) | 0 | ||||
| -rw-r--r-- | release/scripts/presets/camera/1_colon_2.5_inch.py (renamed from release/scripts/presets/camera/1__colon__2.5_inch.py) | 0 | ||||
| -rw-r--r-- | release/scripts/presets/camera/2_colon_3_inch.py (renamed from release/scripts/presets/camera/2__colon__3_inch.py) | 0 | ||||
| -rw-r--r-- | release/scripts/presets/camera/4_colon_3_inch.py (renamed from release/scripts/presets/camera/4__colon__3_inch.py) | 0 |
5 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 diff --git a/release/scripts/presets/camera/1__colon__2.3_inch.py b/release/scripts/presets/camera/1_colon_2.3_inch.py index 72548384401..72548384401 100644 --- a/release/scripts/presets/camera/1__colon__2.3_inch.py +++ b/release/scripts/presets/camera/1_colon_2.3_inch.py diff --git a/release/scripts/presets/camera/1__colon__2.5_inch.py b/release/scripts/presets/camera/1_colon_2.5_inch.py index 90f60e7d7f0..90f60e7d7f0 100644 --- a/release/scripts/presets/camera/1__colon__2.5_inch.py +++ b/release/scripts/presets/camera/1_colon_2.5_inch.py diff --git a/release/scripts/presets/camera/2__colon__3_inch.py b/release/scripts/presets/camera/2_colon_3_inch.py index 46436970efc..46436970efc 100644 --- a/release/scripts/presets/camera/2__colon__3_inch.py +++ b/release/scripts/presets/camera/2_colon_3_inch.py diff --git a/release/scripts/presets/camera/4__colon__3_inch.py b/release/scripts/presets/camera/4_colon_3_inch.py index 88346c01ef8..88346c01ef8 100644 --- a/release/scripts/presets/camera/4__colon__3_inch.py +++ b/release/scripts/presets/camera/4_colon_3_inch.py |