[Bf-blender-cvs] [cecd1f9] master: Fix T44752: Clip Editor doesn't respect ColorSpace setting when playback after Prefetch

[Sergey Sharybin]

Commit: cecd1f98a4c1295421ca011ea5bec95b1c918111
Author: Sergey Sharybin
Date:   Mon May 18 16:40:12 2015 +0500
Branches: master
https://developer.blender.org/rBcecd1f98a4c1295421ca011ea5bec95b1c918111

Fix T44752: Clip Editor doesn't respect ColorSpace setting when playback after Prefetch

===================================================================

M	source/blender/editors/space_clip/clip_editor.c

===================================================================

diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 9acb9f3..d67c03f 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;
 		}