tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix #119465: Incorrect color when changing VSE colorspace 

Cached strip images were not invalidated, which caused, that these
images were kept in memory in incorrect colorspace.

Code readability was improved a bit and clarifying comments were added
to avoid confusion about what is the code supposed to do.

Pull Request: https://projects.blender.org/blender/blender/pulls/119475
This commit is contained in:
Richard Antalik 2024-03-22 20:11:51 +01:00 committed by Richard Antalik
parent 3f4d924298
commit bee70e0c03
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/makesrna/intern/rna_color.cc
View File

@ -597,6 +597,8 @@ struct Seq_colorspace_cb_data {
Sequence *r_seq;
};
/* Colorspace could be changed for scene, but also VSE strip. If property pointer matches one of
* strip, set `r_seq`, so not all cached images have to be invalidated. */
static bool seq_find_colorspace_settings_cb(Sequence *seq, void *user_data)
{
Seq_colorspace_cb_data *cd = (Seq_colorspace_cb_data *)user_data;
@ -607,12 +609,6 @@ static bool seq_find_colorspace_settings_cb(Sequence *seq, void *user_data)
return true;
}
static bool seq_free_anim_cb(Sequence *seq, void * /*user_data*/)
{
SEQ_relations_sequence_free_anim(seq);
return true;
}
static void rna_ColorManagedColorspaceSettings_reload_update(Main *bmain,
Scene * /*scene*/,
PointerRNA *ptr)
@ -653,23 +649,25 @@ static void rna_ColorManagedColorspaceSettings_reload_update(Main *bmain,
ptr->data;
Seq_colorspace_cb_data cb_data = {colorspace_settings, nullptr};
if (&scene->sequencer_colorspace_settings != colorspace_settings) {
SEQ_for_each_callback(&scene->ed->seqbase, seq_find_colorspace_settings_cb, &cb_data);
}
Sequence *seq = cb_data.r_seq;
if (seq) {
SEQ_relations_sequence_free_anim(seq);
if (seq->strip->proxy && seq->strip->proxy->anim) {
IMB_free_anim(seq->strip->proxy->anim);
seq->strip->proxy->anim = nullptr;
}
SEQ_relations_invalidate_cache_raw(scene, seq);
if (&scene->sequencer_colorspace_settings == colorspace_settings) {
/* Scene colorspace was changed. */
SEQ_cache_cleanup(scene);
}
else {
SEQ_for_each_callback(&scene->ed->seqbase, seq_free_anim_cb, nullptr);
/* Strip colorspace was likely changed. */
SEQ_for_each_callback(&scene->ed->seqbase, seq_find_colorspace_settings_cb, &cb_data);
Sequence *seq = cb_data.r_seq;
if (seq) {
SEQ_relations_sequence_free_anim(seq);
if (seq->strip->proxy && seq->strip->proxy->anim) {
IMB_free_anim(seq->strip->proxy->anim);
seq->strip->proxy->anim = nullptr;
}
SEQ_relations_invalidate_cache_raw(scene, seq);
}
}
WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, nullptr);