blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix T43078: Strip custom proxy files did not respect color space settings

This commit is contained in:
Sergey Sharybin 2015-01-01 14:52:37 +05:00
parent c24b694986
commit ec9a137bb2
Notes: blender-bot 2023-02-14 09:40:14 +01:00 
Referenced by issue #43078, Proxy file doesn't respect the strip Color Space or Sequence's
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/sequencer.c
View File

@ -1452,8 +1452,8 @@ static ImBuf *seq_proxy_fetch(const SeqRenderData *context, Sequence *seq, int c
return NULL;
}
/* proxies are generated in default color space */
seq->strip->proxy->anim = openanim(name, IB_rect, 0, NULL);
seq->strip->proxy->anim = openanim(name, IB_rect, 0,
seq->strip->colorspace_settings.name);
}
if (seq->strip->proxy->anim == NULL) {
return NULL;

4
source/blender/makesrna/intern/rna_color.c
View File

@ -614,6 +614,10 @@ static void rna_ColorManagedColorspaceSettings_reload_update(Main *UNUSED(bmain)
IMB_free_anim(seq->anim);
seq->anim = NULL;
}
if (seq->strip->proxy && seq->strip->proxy->anim) {
IMB_free_anim(seq->strip->proxy->anim);
seq->strip->proxy->anim = NULL;
}
BKE_sequence_invalidate_cache(scene, seq);
BKE_sequencer_preprocessed_cache_cleanup_sequence(seq);