[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39149] branches/soc-2011-tomato/source/ blender/blenkernel/intern/movieclip.c: Camera tracking integration

[Sergey Sharybin]

Revision: 39149
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39149
Author:   nazgul
Date:     2011-08-07 16:10:14 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================

Corrected focal length initialization. Now it'll be 24mm, not 24px.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c	2011-08-07 15:40:15 UTC (rev 39148)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c	2011-08-07 16:10:14 UTC (rev 39149)
@@ -230,7 +230,6 @@
 
 	clip->aspx= clip->aspy= 1.0f;
 
-	clip->tracking.camera.focal= 24.f;
 	clip->tracking.camera.sensor_width= 35.0f;
 	clip->tracking.camera.sensor_height= 18.0f;
 	clip->tracking.camera.units= CAMERA_UNITS_MM;
@@ -298,6 +297,8 @@
 	if(width && height) {
 		clip->tracking.camera.principal[0]= ((float)width)/2;
 		clip->tracking.camera.principal[1]= ((float)height)/2;
+
+		clip->tracking.camera.focal= 24.f*width/clip->tracking.camera.sensor_width;
 	}
 
 	return clip;