[Bf-blender-cvs] [58c8d7377b6] soc-2021-vse-strip-thumbnails: Fixed issue with strip slip
Aditya Y Jeppu
noreply at git.blender.org
Wed Jul 14 10:29:39 CEST 2021
Commit: 58c8d7377b67bcef101706bd1f1c2ac0726d02a2
Author: Aditya Y Jeppu
Date: Wed Jul 14 13:59:20 2021 +0530
Branches: soc-2021-vse-strip-thumbnails
https://developer.blender.org/rB58c8d7377b67bcef101706bd1f1c2ac0726d02a2
Fixed issue with strip slip
===================================================================
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/sequencer/intern/image_cache.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 75cf8542f67..e4968aa4751 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -633,7 +633,10 @@ static bool sequencer_slip_recursively(Scene *scene, SlipData *data, int offset)
}
}
if (changed) {
- SEQ_relations_free_imbuf(scene, &ed->seqbase, false);
+ for (int i = data->num_seq - 1; i >= 0; i--) {
+ Sequence *seq = data->seq_array[i];
+ SEQ_relations_invalidate_cache_preprocessed(scene, seq);
+ }
}
return changed;
}
diff --git a/source/blender/sequencer/intern/image_cache.c b/source/blender/sequencer/intern/image_cache.c
index e230e15e721..cfc3aa13867 100644
--- a/source/blender/sequencer/intern/image_cache.c
+++ b/source/blender/sequencer/intern/image_cache.c
@@ -767,7 +767,7 @@ static float seq_cache_timeline_frame_to_frame_index(Sequence *seq, float timeli
/* With raw images, map timeline_frame to strip input media frame range. This means that static
* images or extended frame range of movies will only generate one cache entry. No special
* treatment in converting frame index to timeline_frame is needed. */
- if (type == SEQ_CACHE_STORE_RAW) {
+ if (type == SEQ_CACHE_STORE_RAW || type == SEQ_CACHE_STORE_THUMBNAIL) {
return seq_give_frame_index(seq, timeline_frame);
}
More information about the Bf-blender-cvs
mailing list