diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-06 15:27:16 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-06 15:32:45 +0400 |
| commit | 4ce7d5cb79e23c4b28b1f1afe11fa066f3a5ea9c (patch) | |
| tree | 973e72317b1f1af5f508b6ca82a8eca9dab8bac8 /source/blender/imbuf/intern/indexer.c | |
| parent | 68ef6797b2fc2d2e37f59f6aae0d57b4ce8cc4bc (diff) | |
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.
Diffstat (limited to 'source/blender/imbuf/intern/indexer.c')
| -rw-r--r-- | source/blender/imbuf/intern/indexer.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |