griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Richard Antalik
2023-10-19 02:03:36 +02:00
parent f9a36b1548 d4fd65ffc9
commit 1d9519004a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_sequencer/sequencer_retiming.cc
View File

@@ -202,11 +202,10 @@ static bool retiming_key_add_new_for_seq(bContext *C,
const int timeline_frame)
{
Scene *scene = CTX_data_scene(C);
SEQ_retiming_data_ensure(seq);
const int frame_index = BKE_scene_frame_get(scene) - SEQ_time_start_frame_get(seq);
const SeqRetimingKey *key = SEQ_retiming_find_segment_start_key(seq, frame_index);
if (SEQ_retiming_key_is_transition_start(key)) {
if (key != nullptr && SEQ_retiming_key_is_transition_start(key)) {
BKE_report(op->reports, RPT_WARNING, "Can not create key inside of speed transition");
return false;
}
@@ -216,6 +215,7 @@ static bool retiming_key_add_new_for_seq(bContext *C,
return false;
}
SEQ_retiming_data_ensure(seq);
SEQ_retiming_add_key(scene, seq, timeline_frame);
return true;
}