From 4ce7d5cb79e23c4b28b1f1afe11fa066f3a5ea9c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 6 Mar 2014 17:27:16 +0600 Subject: Fixes for proxies color space Basically proxy colorspace didn't work well enough. It is still a bit weird and mainly: - Proxies for image sequences are built in the image color space. - Proxies for movies are built in the movie color space. This could be unified but would need some work in proxy build to make it not just pipe frames from one FFmpeg context to another but also apply OCIO on it. --- source/blender/imbuf/intern/indexer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/imbuf/intern/indexer.c') diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 3eaf42b1b22..2afcda8a1a6 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -1265,8 +1265,8 @@ struct anim *IMB_anim_open_proxy( get_proxy_filename(anim, preview_size, fname, FALSE); - /* proxies are generated in default color space */ - anim->proxy_anim[i] = IMB_open_anim(fname, 0, 0, NULL); + /* proxies are generated in the same color space as animation itself */ + anim->proxy_anim[i] = IMB_open_anim(fname, 0, 0, anim->colorspace); anim->proxies_tried |= preview_size; -- cgit v1.2.3