Fix T43078: Strip custom proxy files did not respect color space settings
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 1 Jan 2015 09:52:37 +0000 (14:52 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 1 Jan 2015 09:52:37 +0000 (14:52 +0500)
source/blender/blenkernel/intern/sequencer.c
source/blender/makesrna/intern/rna_color.c

index ddc0d5874f85a5f4bb0801a53acb1adcd9612fbf..1344062a958c18e53355e651b7aa084fe4938dde 100644 (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;
index fa2a3258d1aa32d3d1b831ce876d3f0377c78881..37201eca5f6d10b64015bbd08529c8024dcfd98d 100644 (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);