forked from bartvdbraak/blender
== Sequencer ==
This fixes loading of hard trimmed audio files in readfile and adds trim options to N-keys for audio files.
This commit is contained in:
parent
c2580dd639
commit
fe83427cc9
@ -457,6 +457,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel):
|
|||||||
row = layout.row(align=True)
|
row = layout.row(align=True)
|
||||||
sub = row.row()
|
sub = row.row()
|
||||||
sub.scale_x = 2.0
|
sub.scale_x = 2.0
|
||||||
|
|
||||||
if not context.screen.animation_playing:
|
if not context.screen.animation_playing:
|
||||||
sub.operator("screen.animation_play", text="", icon='PLAY')
|
sub.operator("screen.animation_play", text="", icon='PLAY')
|
||||||
else:
|
else:
|
||||||
@ -666,6 +667,11 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel):
|
|||||||
|
|
||||||
layout.prop(strip, "volume")
|
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):
|
class SEQUENCER_PT_scene(SequencerButtonsPanel):
|
||||||
bl_label = "Scene"
|
bl_label = "Scene"
|
||||||
|
@ -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->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
|
||||||
if(seq->scene) {
|
if(seq->scene) {
|
||||||
seq->scene= newlibadr(fd, sce->id.lib, 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->scene_camera) seq->scene_camera= newlibadr(fd, sce->id.lib, seq->scene_camera);
|
||||||
if(seq->sound) {
|
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);
|
seq->sound= newlibadr(fd, sce->id.lib, seq->sound);
|
||||||
if (seq->sound) {
|
if (seq->sound) {
|
||||||
seq->sound->id.us++;
|
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;
|
seq->anim= 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user