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 | |
parent | 8777b33699b2fc81bc503793599120d3dd86c9eb (diff) | |
parent | 597122d72b691ac6522b5ee2acd26e2b4b1135a5 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
6 files changed, 25 insertions, 15 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index f5f1339ed97..03ebea69d2b 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -992,7 +992,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): render = max(scene.cycles.dicing_rate * ob.cycles.dicing_rate, 0.1) preview = max(scene.cycles.preview_dicing_rate * ob.cycles.dicing_rate, 0.1) - col.label("Render %.2f px, Preview %.2f px" % (render, preview)) + col.label(f"Render {render:10.2f} px, Preview {preview:10.2f} px") def SURFACE(self, layout, ob, md): layout.label(text="Settings are inside the Physics tab") 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 diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 61beb968f1c..5dcafcd7888 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -104,7 +104,11 @@ class IMAGE_MT_view(Menu): ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1)) for a, b in ratios: - layout.operator("image.view_zoom_ratio", text=iface_("Zoom %d:%d") % (a, b), translate=False).ratio = a / b + layout.operator( + "image.view_zoom_ratio", + text=iface_(f"Zoom {a:d}:{b:d}"), + translate=False, + ).ratio = a / b layout.separator() diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index f350e854dd1..be2d054e0f0 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -703,11 +703,11 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if i == strip.multicam_source: sub = row.row(align=True) sub.enabled = False - sub.operator("sequencer.cut_multicam", text="%d" % i).camera = i + sub.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i else: sub_1 = row.row(align=True) sub_1.enabled = True - sub_1.operator("sequencer.cut_multicam", text="%d" % i).camera = i + sub_1.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i if strip.channel > BT_ROW and (strip_channel - 1) % BT_ROW: for i in range(strip.channel, strip_channel + ((BT_ROW + 1 - strip_channel) % BT_ROW)): diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index af9c0e80ae5..37ea88dd546 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -54,20 +54,26 @@ class TEXT_HT_header(Header): layout.separator_spacer() if text: - osl = text.name.endswith(".osl") or text.name.endswith(".oso") + is_osl = text.name.endswith((".osl", ".osl")) row = layout.row() if text.filepath: if text.is_dirty: - row.label(text=iface_("File: *%r (unsaved)") % - text.filepath, translate=False) + row.label( + iface_(f"File: *{text.filepath} (unsaved)"), + translate=False, + ) else: - row.label(text=iface_("File: %r") % - text.filepath, translate=False) + row.label( + iface_(f"File: {text.filepath}"), + translate=False, + ) else: - row.label(text="Text: External" - if text.library - else "Text: Internal") + row.label( + "Text: External" + if text.library + else "Text: Internal" + ) if osl: row = layout.row() row.operator("node.shader_script_update") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 3b98a4e857f..a83283102c8 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -952,7 +952,7 @@ class USERPREF_PT_theme(Panel): col = split.column() for i, ui in enumerate(theme.bone_color_sets, 1): - col.label(text=iface_("Color Set %d:") % i, translate=False) + col.label(iface_(f"Color Set {i:d}"), translate=False) row = col.row() |