diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-28 22:14:44 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-28 22:14:44 +0400 |
commit | 7ecc0ba99930fb0ab7a63134f03c9ba5b24c1910 (patch) | |
tree | 9e5d55a110a3c71a465c7dc5bbf141a94bf15a0d /source | |
parent | a7e943c8506fc13da59b58f33c3a7472423d5c19 (diff) |
Fix regression in clip reloading -- after recent change movie used
to be reset to default image size instead of it's actual size.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 045f0adaf41..4c23a370a5d 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -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); |