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

Fix #124767: VSE cache not updated for moved strips

Browse Source 
The cache invalidation worked on basis of timeline frame instead of
frame index, which caused, that these images were outside of range, that
was considered to be changed, after strip was moved.

In this case the issue happened only with effect strips. This was not
an issue before, mainly because raw images for these strips were not
stored. For other strip types, raw image does not usually change.

This seems to be "caused" by f4f708a54f .

Pull Request: https://projects.blender.org/blender/blender/pulls/124870
This commit is contained in:
Richard Antalik
2024-07-17 14:23:57 +02:00
committed by Richard Antalik
parent dd3a48642e
commit 6a39d79967
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/sequencer/intern/image_cache.cc
View File

@@ -652,12 +652,22 @@ void seq_cache_cleanup_sequence(Scene *scene,
seq_cache_lock(scene);
int range_start = SEQ_time_left_handle_frame_get(scene, seq_changed);
int range_end = SEQ_time_right_handle_frame_get(scene, seq_changed);
const int range_start_seq_changed = seq_cache_timeline_frame_to_frame_index(
scene, seq, SEQ_time_left_handle_frame_get(scene, seq_changed), invalidate_types);
const int range_end_seq_changed = seq_cache_timeline_frame_to_frame_index(
scene, seq, SEQ_time_right_handle_frame_get(scene, seq_changed), invalidate_types);
int range_start = range_start_seq_changed;
int range_end = range_end_seq_changed;
if (!force_seq_changed_range) {
range_start = max_ii(range_start, SEQ_time_left_handle_frame_get(scene, seq));
range_end = min_ii(range_end, SEQ_time_right_handle_frame_get(scene, seq));
const int range_start_seq = seq_cache_timeline_frame_to_frame_index(
scene, seq, SEQ_time_left_handle_frame_get(scene, seq), invalidate_types);
const int range_end_seq = seq_cache_timeline_frame_to_frame_index(
scene, seq, SEQ_time_right_handle_frame_get(scene, seq), invalidate_types);
range_start = max_ii(range_start, range_start_seq);
range_end = min_ii(range_end, range_end_seq);
}
int invalidate_composite = invalidate_types & SEQ_CACHE_STORE_FINAL_OUT;
@@ -672,15 +682,15 @@ void seq_cache_cleanup_sequence(Scene *scene,
BLI_assert(key->cache_owner == cache);
/* Clean all final and composite in intersection of seq and seq_changed. */
if (key->type & invalidate_composite && key->timeline_frame >= range_start &&
key->timeline_frame <= range_end)
if (key->type & invalidate_composite && key->frame_index >= range_start &&
key->frame_index <= range_end)
{
seq_cache_key_unlink(key);
BLI_ghash_remove(cache->hash, key, seq_cache_keyfree, seq_cache_valfree);
}
else if (key->type & invalidate_source && key->seq == seq &&
key->timeline_frame >= SEQ_time_left_handle_frame_get(scene, seq_changed) &&
key->timeline_frame <= SEQ_time_right_handle_frame_get(scene, seq_changed))
key->frame_index >= range_start_seq_changed &&
key->frame_index <= range_end_seq_changed)
{
seq_cache_key_unlink(key);
BLI_ghash_remove(cache->hash, key, seq_cache_keyfree, seq_cache_valfree);