diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-14 10:31:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-14 10:31:52 +0300 |
| commit | 9d1ad27fdc73073c34d7556f6953b637b764b4f0 (patch) | |
| tree | 2e2598dd0c8c73d56a8115944096d20e2931f79d /release/scripts/startup | |
| parent | 9ca8f40790db6c40f260090a380be7ddb18e1dfa (diff) | |
| parent | 43973410f3c0a6ab17be3a7899c64fee1787c61e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup')
| -rw-r--r-- | release/scripts/startup/bl_operators/screen_play_rendered_anim.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_text.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py index 46cf07be0f5..27c8487eaa9 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -149,7 +149,7 @@ class PlayRenderedAnim(Operator): opts = [file, f"{scene.frame_start:d}-{scene.frame_end:d}"] cmd.extend(opts) elif preset == 'RV': - opts = ["-fps", str(rd.fps), "-play", f"[ {file} ]"] + opts = ["-fps", str(rd.fps), "-play", f"[ {file:s} ]"] cmd.extend(opts) elif preset == 'MPLAYER': opts = [] diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 95124d2be83..8e370326d8c 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -60,12 +60,12 @@ class TEXT_HT_header(Header): if text.filepath: if text.is_dirty: row.label( - iface_(f"File: *{text.filepath} (unsaved)"), + iface_(f"File: *{text.filepath:s} (unsaved)"), translate=False, ) else: row.label( - iface_(f"File: {text.filepath}"), + iface_(f"File: {text.filepath:s}"), translate=False, ) else: |