Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T41883: Strip keyframes not respected for scenes rendered by other scenes

Browse Source
This commit is contained in:
Sergey Sharybin
2016-09-06 14:07:07 +02:00
parent e3e8ce08a6
commit b40d1c1903
1 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
source/blender/editors/sound/sound_ops.c
View File

@@ -217,32 +217,56 @@ static void SOUND_OT_open_mono(wmOperatorType *ot)
/* ******************************************************* */ /* ******************************************************* */
static int sound_update_animation_flags_exec(bContext *C, wmOperator *UNUSED(op)) static void sound_update_animation_flags(Scene *scene);
static int sound_update_animation_flags_cb(Sequence *seq, void *user_data)
{
struct FCurve *fcu;
Scene *scene = (Scene *)user_data;
bool driven;
fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "volume", 0, &driven);
if (fcu || driven)
seq->flag |= SEQ_AUDIO_VOLUME_ANIMATED;
else
seq->flag &= ~SEQ_AUDIO_VOLUME_ANIMATED;
fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "pitch", 0, &driven);
if (fcu || driven)
seq->flag |= SEQ_AUDIO_PITCH_ANIMATED;
else
seq->flag &= ~SEQ_AUDIO_PITCH_ANIMATED;
fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "pan", 0, &driven);
if (fcu || driven)
seq->flag |= SEQ_AUDIO_PAN_ANIMATED;
else
seq->flag &= ~SEQ_AUDIO_PAN_ANIMATED;
if (seq->type == SEQ_TYPE_SCENE) {
/* TODO(sergey): For now we do manual recursion into the scene strips,
* but perhaps it should be covered by recursive_apply?
*/
sound_update_animation_flags(seq->scene);
}
return 0;
}
static void sound_update_animation_flags(Scene *scene)
{ {
Sequence *seq;
Scene *scene = CTX_data_scene(C);
struct FCurve *fcu; struct FCurve *fcu;
bool driven; bool driven;
Sequence *seq;
if (scene->id.tag & LIB_TAG_DOIT) {
return;
}
scene->id.tag |= LIB_TAG_DOIT;
SEQ_BEGIN(scene->ed, seq) SEQ_BEGIN(scene->ed, seq)
{ {
fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "volume", 0, &driven); BKE_sequencer_recursive_apply(seq, sound_update_animation_flags_cb, scene);
if (fcu || driven)
seq->flag |= SEQ_AUDIO_VOLUME_ANIMATED;
else
seq->flag &= ~SEQ_AUDIO_VOLUME_ANIMATED;
fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "pitch", 0, &driven);
if (fcu || driven)
seq->flag |= SEQ_AUDIO_PITCH_ANIMATED;
else
seq->flag &= ~SEQ_AUDIO_PITCH_ANIMATED;
fcu = id_data_find_fcurve(&scene->id, seq, &RNA_Sequence, "pan", 0, &driven);
if (fcu || driven)
seq->flag |= SEQ_AUDIO_PAN_ANIMATED;
else
seq->flag &= ~SEQ_AUDIO_PAN_ANIMATED;
} }
SEQ_END SEQ_END
@@ -251,7 +275,12 @@ static int sound_update_animation_flags_exec(bContext *C, wmOperator *UNUSED(op)
scene->audio.flag |= AUDIO_VOLUME_ANIMATED; scene->audio.flag |= AUDIO_VOLUME_ANIMATED;
else else
scene->audio.flag &= ~AUDIO_VOLUME_ANIMATED; scene->audio.flag &= ~AUDIO_VOLUME_ANIMATED;
}
static int sound_update_animation_flags_exec(bContext *C, wmOperator *UNUSED(op))
{
BKE_main_id_tag_idcode(CTX_data_main(C), ID_SCE, LIB_TAG_DOIT, false);
sound_update_animation_flags(CTX_data_scene(C));
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }