diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-28 09:50:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-28 09:50:11 +0300 |
| commit | 53e191e0a5e229dfff7a8bb1ac18e8dbd5120b31 (patch) | |
| tree | 278fa7155ca1a4c4a69a8c133d83cdb5db6bd0fe /release/scripts/startup/bl_ui/properties_render.py | |
| parent | 8777b33699b2fc81bc503793599120d3dd86c9eb (diff) | |
| parent | 597122d72b691ac6522b5ee2acd26e2b4b1135a5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 78e77ce5f31..580c31465b3 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -104,10 +104,10 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel): custom_framerate = (fps_rate not in {23.98, 24, 25, 29.97, 30, 50, 59.94, 60}) if custom_framerate is True: - fps_label_text = "Custom (%r fps)" % fps_rate + fps_label_text = f"Custom ({fps_rate!r} fps)" show_framerate = True else: - fps_label_text = "%r fps" % fps_rate + fps_label_text = f"{fps_rate!r} fps" show_framerate = (preset_label == "Custom") RENDER_PT_dimensions._frame_rate_args_prev = args |