blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-06-28 08:50:11 +02:00
parent 8777b33699 597122d72b
commit 53e191e0a5
6 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_data_modifier.py
View File

@ -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")

4
release/scripts/startup/bl_ui/properties_render.py
View File

@ -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

6
release/scripts/startup/bl_ui/space_image.py
View File

@ -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()

4
release/scripts/startup/bl_ui/space_sequencer.py
View File

@ -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)):

22
release/scripts/startup/bl_ui/space_text.py
View File

@ -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")

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -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()