Merging r42896 through r42944 from trunk into soc-2911-tomato
[blender.git] / source / blender / blenkernel / intern / movieclip.c
index 224ce003ea34c5828375511213c996e566eb3eca..ab963f1e78c158221bc8a9837821a0dec16818b8 100644 (file)
@@ -921,15 +921,17 @@ static void movieclip_build_proxy_ibuf(MovieClip *clip, ImBuf *ibuf, int cfra, i
        IMB_freeImBuf(scaleibuf);
 }
 
-void BKE_movieclip_build_proxy_frame(MovieClip *clip, struct MovieDistortion *distortion,
+void BKE_movieclip_build_proxy_frame(MovieClip *clip, int clip_flag, struct MovieDistortion *distortion,
                        int cfra, int *build_sizes, int build_count, int undistorted)
 {
        ImBuf *ibuf;
        MovieClipUser user;
 
        user.framenr= cfra;
+       user.render_flag= 0;
+       user.render_size= MCLIP_PROXY_RENDER_SIZE_FULL;
 
-       ibuf= BKE_movieclip_get_ibuf_flag(clip, &user, 0);
+       ibuf= BKE_movieclip_get_ibuf_flag(clip, &user, clip_flag);
 
        if(ibuf) {
                ImBuf *tmpibuf= ibuf;