Object tracking: configurable scale for object solution

Added slider to define scale of object solution which is used to define
"depth" of object relative to camera position. This slider effects on all
"users" of object solution such as bundles display, constrained objects and so.

Added new operator called "Set Solution Scale" to set real scale for object
solution based on real distance between two bundles reconstructed for this object.

New slider and operator can be found on "Object" panel in toolbox when in
reconstruction mode and active tracking object isn't a camera.

1 files changed, 7 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index fd0e281b60f..25ae75dcb03 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -142,7 +142,10 @@ typedef struct MovieTrackingSettings {
 
 	/* cleanup */
 	int clean_frames, clean_action;
-	float clean_error, pad;
+	float clean_error;
+
+	/* set object scale */
+	float object_distance;		/* distance between two bundles used for object scaling */
 } MovieTrackingSettings;
 
 typedef struct MovieTrackingStabilization {
@@ -176,7 +179,9 @@ typedef struct MovieTrackingObject {
 	struct MovieTrackingObject *next, *prev;
 
 	char name[24];			/* Name of tracking object */
-	int flag, pad;
+	int flag;
+	float scale;			/* scale of object solution in amera space */
+
 	ListBase tracks;		/* list of tracks use to tracking this object */
 	MovieTrackingReconstruction reconstruction;	/* reconstruction data for this object */
 } MovieTrackingObject;