blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v3.1-release'

This commit is contained in:
Richard Antalik 2022-02-01 22:54:23 +01:00
parent 6b914a43ad 95fcb41841
commit b91ae8b14c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_sequencer/sequencer_add.c
View File

@ -739,15 +739,15 @@ static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
/* Free custom data. */
sequencer_add_cancel(C, op);
SEQ_collection_free(movie_strips);
seq_build_proxy(C, movie_strips);
DEG_relations_tag_update(bmain);
DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS);
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
/* Free custom data. */
sequencer_add_cancel(C, op);
SEQ_collection_free(movie_strips);
return OPERATOR_FINISHED;
}

6
source/blender/imbuf/intern/indexer.c
View File

@ -247,8 +247,10 @@ struct anim_index *IMB_indexer_open(const char *name)
uint64_t IMB_indexer_get_seek_pos(struct anim_index *idx, int frame_index)
{
if (frame_index < 0) {
frame_index = 0;
/* This is hard coded, because our current timecode files return non zero seek position for index
* 0. Only when seeking to 0 it is guaranteed, that first packet will be read. */
if (frame_index <= 0) {
return 0;
}
if (frame_index >= idx->num_entries) {
frame_index = idx->num_entries - 1;