Merging r49300 through r49333 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / movieclip.c
index 2a5d698f942eec044e8f5ed11d00649c0416f6fa..c56bb76157918fb4c232483906911677ffd1162c 100644 (file)
@@ -505,7 +505,9 @@ static void movieclip_load_get_szie(MovieClip *clip)
        if (width && height) {
                clip->tracking.camera.principal[0] = ((float)width) / 2.0f;
                clip->tracking.camera.principal[1] = ((float)height) / 2.0f;
-
+       }
+       else {
+               clip->lastsize[0] = clip->lastsize[1] = IMG_SIZE_FALLBACK;
        }
 }
 
@@ -1080,7 +1082,7 @@ void BKE_movieclip_reload(MovieClip *clip)
        else
                clip->source = MCLIP_SRC_SEQUENCE;
 
-       clip->lastsize[0] = clip->lastsize[1] = IMG_SIZE_FALLBACK;
+       clip->lastsize[0] = clip->lastsize[1] = 0;
        movieclip_load_get_szie(clip);
 
        movieclip_calc_length(clip);