diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-18 14:40:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-18 14:40:52 +0300 |
| commit | cecd1f98a4c1295421ca011ea5bec95b1c918111 (patch) | |
| tree | 93bf9c5b91bc4078fe322b515a12f470393465e5 /source/blender/editors/space_clip | |
| parent | 45afc02f11871b5c9f4d7bc6794761c6a4d883d8 (diff) | |
Fix T44752: Clip Editor doesn't respect ColorSpace setting when playback after Prefetch
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index 9acb9f3effc..d67c03f3622 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -767,13 +767,15 @@ static void prefetch_task_func(TaskPool *pool, void *task_data, int UNUSED(threa int flag = IB_rect | IB_alphamode_detect; int result; char *colorspace_name = NULL; + const bool use_proxy = (clip->flag & MCLIP_USE_PROXY) && + (queue->render_size != MCLIP_PROXY_RENDER_SIZE_FULL); user.framenr = current_frame; user.render_size = queue->render_size; user.render_flag = queue->render_flag; /* Proxies are stored in the display space. */ - if (queue->render_flag & MCLIP_USE_PROXY) { + if (!use_proxy) { colorspace_name = clip->colorspace_settings.name; } |