Merging r39717 through r39983 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / movieclip.c
index afd1c340d4f099e88b231a85a83e365ffc9bd2c6..220a050fcc03a2f8eb9e98586173d60ee651bce6 100644 (file)
@@ -215,8 +215,8 @@ static ImBuf *movieclip_load_movie_file(MovieClip *clip, int framenr, int flag)
                else
                        BLI_path_abs(str, G.main->name);
 
-               clip->anim= openanim(str, IB_rect);
-
+               /* FIXME: make several stream accessible in image editor, too */
+               clip->anim= openanim(str, IB_rect, 0);
 
                if(clip->anim) {
                        if(clip->flag&MCLIP_USE_PROXY_CUSTOM_DIR) {
@@ -348,6 +348,7 @@ static MovieClip *movieclip_alloc(const char *name)
        clip->tracking.settings.keyframe1= 1;
        clip->tracking.settings.keyframe2= 30;
        clip->tracking.settings.dist= 1;
+       clip->tracking.settings.corr= 0.75;
 
        clip->tracking.stabilization.scaleinf= 1.f;
        clip->tracking.stabilization.locinf= 1.f;