diff options
author | Richard Antalik <richardantalik@gmail.com> | 2022-02-02 00:54:23 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2022-02-02 00:54:23 +0300 |
commit | b91ae8b14cfde297551e67547600692bbe75a889 (patch) | |
tree | 316203f75db671565878575ca020c0bdf201e31d /source | |
parent | 6b914a43ad3b16a441e5e5b8d5f9745977e790a8 (diff) | |
parent | 95fcb4184108aff91eb46f4192af5b0826e486a7 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/indexer.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 15ee35f375d..aef6b30986d 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -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; } diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index a85ba65d014..00e96e7840b 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -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; |