From 946ae26349eedbd6d7bdd859280c10ad80520417 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 1 Jun 2020 14:41:12 +1000 Subject: UI: use term current frame instead of playhead Avoid mixing different terminologies up, current frame is used in a majority of Blender. --- release/scripts/startup/bl_operators/sequencer.py | 2 +- release/scripts/startup/bl_ui/space_sequencer.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index 206f778195e..af071561232 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -188,7 +188,7 @@ class SequencerFadesAdd(Operator): ('CURSOR_TO', 'To Playhead', 'Fade from the start of sequences under the time cursor to the current frame'), ), name="Fade type", - description="Fade in, out, both in and out, to, or from the playhead. Default is both in and out", + description="Fade in, out, both in and out, to, or from the current frame. Default is both in and out", default='IN_OUT') @classmethod diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 9c20a55c294..76523e1ab04 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1585,10 +1585,10 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel): split.alignment = 'RIGHT' split.label(text="Playhead") split = split.split(factor=0.8 + max_factor, align=True) - playhead = frame_current - frame_final_start - split.label(text="{:>14}".format(smpte_from_frame(playhead))) + frame_display = frame_current - frame_final_start + split.label(text="{:>14}".format(smpte_from_frame(frame_display))) split.alignment = 'RIGHT' - split.label(text=str(playhead) + " ") + split.label(text=str(frame_display) + " ") if strip.type == 'SCENE': scene = strip.scene -- cgit v1.2.3