Commit: 4d47e752238e24b4ae3faec36a98c3c4e8e833a2
Author: Sergey Sharybin
Date: Mon Mar 10 16:46:05 2014 +0600
https://developer.blender.org/rB4d47e752238e24b4ae3faec36a98c3c4e8e833a2
Fix for proxy colorspace and prefetching
===================================================================
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 0543e34..18652aa 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -765,12 +765,18 @@ static void *do_prefetch_thread(void *data_v)
MovieClipUser user = {0};
int flag = IB_rect | IB_alphamode_detect;
int result;
+ char *colorspace_name = NULL;
user.framenr = current_frame;
user.render_size = data->queue->render_size;
user.render_flag = data->queue->render_flag;
- ibuf = IMB_ibImageFromMemory(mem, size, flag,
clip->colorspace_settings.name, "prefetch frame");
+ /* Proxies are stored in the display space. */
+ if (data->queue->render_flag & MCLIP_USE_PROXY) {
+ colorspace_name = clip->colorspace_settings.name;
+ }
+
+ ibuf = IMB_ibImageFromMemory(mem, size, flag, colorspace_name,
"prefetch frame");
result = BKE_movieclip_put_frame_if_possible(data->clip, &user,
ibuf);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
