[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49333] trunk/blender/source/blender/ blenkernel/intern/movieclip.c: Fix regression in clip reloading -- after recent change movie used

[Sergey Sharybin]

Revision: 49333
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49333
Author:   nazgul
Date:     2012-07-28 18:14:44 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Fix regression in clip reloading -- after recent change movie used
to be reset to default image size instead of it's actual size.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/movieclip.c

Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-07-28 17:35:09 UTC (rev 49332)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c	2012-07-28 18:14:44 UTC (rev 49333)
@@ -504,8 +504,10 @@
 	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;
+	}
 }
 
 /* checks if image was already loaded, then returns same image
@@ -1074,7 +1076,7 @@
 	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);