[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41390] branches/soc-2011-tomato/source/ blender/blenkernel/BKE_object.h: Camera tracking integration

[Sergey Sharybin]

Revision: 41390
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41390
Author:   nazgul
Date:     2011-10-30 22:44:31 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fixed compilation error caused by some changes related on sensor height.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h	2011-10-30 22:13:52 UTC (rev 41389)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h	2011-10-30 22:44:31 UTC (rev 41390)
@@ -141,8 +141,8 @@
 int object_is_modified(struct Scene *scene, struct Object *ob);
 
 void object_camera_mode(struct RenderData *rd, struct Object *camera);
-void object_camera_intrinsics(struct Object *camera, struct Camera **cam_r, short *is_ortho, float *shiftx, float *shifty,
-			float *clipsta, float *clipend, float *lens, float *sensor_x);
+void object_camera_intrinsics(Object *camera, Camera **cam_r, short *is_ortho, float *shiftx, float *shifty,
+			float *clipsta, float *clipend, float *lens, float *sensor_x, float *sensor_y, short *fov_mode)
 void object_camera_matrix(
 		struct RenderData *rd, struct Object *camera, int winx, int winy, short field_second,
 		float winmat[][4], struct rctf *viewplane, float *clipsta, float *clipend, float *lens,