Commit: ec9a137bb2718d8288b8eed876cc385e3f7efdf9
Author: Sergey Sharybin
Date: Thu Jan 1 14:52:37 2015 +0500
Branches: master
https://developer.blender.org/rBec9a137bb2718d8288b8eed876cc385e3f7efdf9
Fix T43078: Strip custom proxy files did not respect color space settings
===================================================================
M source/blender/blenkernel/intern/sequencer.c
M source/blender/makesrna/intern/rna_color.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index ddc0d58..1344062 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -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;
diff --git a/source/blender/makesrna/intern/rna_color.c
b/source/blender/makesrna/intern/rna_color.c
index fa2a325..37201ec 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
