diff options
| -rw-r--r-- | release/scripts/ui/space_sequencer.py | 6 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index e300cfd3d32..c3f056b1394 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -457,6 +457,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel): row = layout.row(align=True) sub = row.row() sub.scale_x = 2.0 + if not context.screen.animation_playing: sub.operator("screen.animation_play", text="", icon='PLAY') else: @@ -666,6 +667,11 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel): layout.prop(strip, "volume") + col = layout.column(align=True) + col.label(text="Trim Duration:") + col.prop(strip, "animation_start_offset", text="Start") + col.prop(strip, "animation_end_offset", text="End") + class SEQUENCER_PT_scene(SequencerButtonsPanel): bl_label = "Scene" diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b0574e7b622..61685ccefce 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4174,7 +4174,7 @@ static void lib_link_scene(FileData *fd, Main *main) if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo); if(seq->scene) { seq->scene= newlibadr(fd, sce->id.lib, seq->scene); - seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs); + seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs); } if(seq->scene_camera) seq->scene_camera= newlibadr(fd, sce->id.lib, seq->scene_camera); if(seq->sound) { @@ -4185,7 +4185,7 @@ static void lib_link_scene(FileData *fd, Main *main) seq->sound= newlibadr(fd, sce->id.lib, seq->sound); if (seq->sound) { seq->sound->id.us++; - seq->scene_sound = sound_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs); + seq->scene_sound = sound_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs); } } seq->anim= 0; |