Fix regression in clip reloading -- after recent change movie used

to be reset to default image size instead of it's actual size.
This commit is contained in:
Sergey Sharybin
2012-07-28 18:14:44 +00:00
parent a7e943c850
commit 7ecc0ba999

View File

@@ -504,7 +504,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;
}
}
@@ -1074,7 +1076,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);