blender
/
blender
135
420
Fork 602
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

blender-v3.6-release backports #110011

Merged
Philipp Oeser merged 23 commits from lichtwerk/blender:blender-v3.6-release into blender-v3.6-release 2023-07-12 15:46:03 +02:00
Conversation 1 Commits 23 Files Changed 32 +3 -4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa2a28e96d - Show all commits

7
source/blender/sequencer/intern/image_cache.c
View File

@ -670,10 +670,9 @@ void seq_cache_cleanup_sequence(Scene *scene,
BLI_ghash_remove(cache->hash, key, seq_cache_keyfree, seq_cache_valfree);
}
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))
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))
{
if (key->link_next || key->link_prev) {
seq_cache_relink_keys(key->link_next, key->link_prev);