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, 11 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index dbc8439e50d..ab362fba143 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -12693,9 +12693,20 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 		for (clip= main->movieclip.first; clip; clip= clip->id.next) {
 			MovieTracking *tracking= &clip->tracking;
+			MovieTrackingObject *tracking_object= tracking->objects.first;
+
+			if(!tracking->settings.object_distance)
+				tracking->settings.object_distance= 1.0f;
 
 			if(tracking->objects.first == NULL)
 				BKE_tracking_new_object(tracking, "Camera");
+
+			while(tracking_object) {
+				if(!tracking_object->scale)
+					tracking_object->scale= 1.0f;
+
+				tracking_object= tracking_object->next;
+			}
 		}
 
 		for (ob= main->object.first; ob; ob= ob->id.next) {