[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60219] branches/soc-2013-motion_track: Add checkbox for multicamera solving

[Joseph Mansfield]

Revision: 60219
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60219
Author:   sftrabbit
Date:     2013-09-18 13:32:57 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Add checkbox for multicamera solving

To enable reconstruction using tracks from multiple cameras, the "Multicamera" checkbox in the Solve panel should be checked. This is currently non-functional.

Modified Paths:
--------------
    branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-motion_track/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_tracking.c

Modified: branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_clip.py	2013-09-18 12:58:12 UTC (rev 60218)
+++ branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_clip.py	2013-09-18 13:32:57 UTC (rev 60219)
@@ -373,7 +373,10 @@
         sub.active = settings.use_fallback_reconstruction
         sub.prop(settings, "reconstruction_success_threshold")
 
+        col = layout.column()
+        col.prop(settings, "use_multicamera_solver")
 
+
 class CLIP_PT_tools_cleanup(CLIP_PT_tracking_panel, Panel):
     bl_space_type = 'CLIP_EDITOR'
     bl_region_type = 'TOOLS'

Modified: branches/soc-2013-motion_track/source/blender/makesdna/DNA_tracking_types.h
===================================================================
--- branches/soc-2013-motion_track/source/blender/makesdna/DNA_tracking_types.h	2013-09-18 12:58:12 UTC (rev 60218)
+++ branches/soc-2013-motion_track/source/blender/makesdna/DNA_tracking_types.h	2013-09-18 13:32:57 UTC (rev 60219)
@@ -412,7 +412,8 @@
 /* MovieTrackingSettings->reconstruction_flag */
 enum {
 	TRACKING_USE_FALLBACK_RECONSTRUCTION = (1 << 0),
-	TRACKING_USE_KEYFRAME_SELECTION      = (1 << 1)
+	TRACKING_USE_KEYFRAME_SELECTION      = (1 << 1),
+	TRACKING_USE_MULTICAMERA_SOLVER      = (1 << 2)
 };
 
 /* MovieTrackingSettings->refine_intrinsics */

Modified: branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_tracking.c	2013-09-18 12:58:12 UTC (rev 60218)
+++ branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_tracking.c	2013-09-18 13:32:57 UTC (rev 60219)
@@ -964,6 +964,12 @@
 	RNA_def_property_ui_text(prop, "Tripod Motion",
 	                         "Use special solver to track a stable camera position, such as a tripod");
 
+	prop = RNA_def_property(srna, "use_multicamera_solver", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
+	RNA_def_property_boolean_sdna(prop, NULL, "reconstruction_flag", TRACKING_USE_MULTICAMERA_SOLVER);
+	RNA_def_property_ui_text(prop, "Multicamera",
+	                         "Use track correspondences between multiple cameras for reconstruction");
+
 	/* default_limit_frames */
 	prop = RNA_def_property(srna, "default_frames_limit", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);