Fix regression in clip reloading -- after recent change movie used
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Jul 2012 18:14:44 +0000 (18:14 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Jul 2012 18:14:44 +0000 (18:14 +0000)
to be reset to default image size instead of it's actual size.

source/blender/blenkernel/intern/movieclip.c

index 045f0adaf41e13217638b7587a3f9641f6c77301..4c23a370a5d1347cb65e062fadf514bc4e9e6be6 100644 (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);