Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +3 -1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 559898709f - Show all commits

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

@ -252,6 +252,8 @@ static int sequesequencer_retiming_handle_add_exec(bContext *C, wmOperator *op)
const Editing *ed = SEQ_editing_get(scene); const Editing *ed = SEQ_editing_get(scene);
Sequence *seq = ed->act_seq; Sequence *seq = ed->act_seq;
SEQ_retiming_data_ensure(seq);
float timeline_frame; float timeline_frame;
if (RNA_struct_property_is_set(op->ptr, "timeline_frame")) { if (RNA_struct_property_is_set(op->ptr, "timeline_frame")) {
timeline_frame = RNA_int_get(op->ptr, "timeline_frame"); timeline_frame = RNA_int_get(op->ptr, "timeline_frame");

2
source/blender/makesrna/intern/rna_sequencer.c
View File

@ -358,7 +358,7 @@ static void rna_Sequence_retiming_handle_frame_set(PointerRNA *ptr, int value)
return; return;
} }
const int offset = value - SEQ_time_start_frame_get(seq) + handle->strip_frame_index; const int offset = value - (SEQ_time_start_frame_get(seq) + handle->strip_frame_index);
SEQ_retiming_offset_handle(scene, seq, handle, offset); SEQ_retiming_offset_handle(scene, seq, handle, offset);
SEQ_relations_invalidate_cache_raw(scene, seq); SEQ_relations_invalidate_cache_raw(scene, seq);
} }