[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60226] branches/soc-2013-motion_track: Remove multicamera solver option

[Joseph Mansfield]

Revision: 60226
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60226
Author:   sftrabbit
Date:     2013-09-18 22:21:32 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Remove multicamera solver option

Reverting the previous commit because Sergey threatened puppies with an axe for every time I add an option.

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 19:55:48 UTC (rev 60225)
+++ branches/soc-2013-motion_track/release/scripts/startup/bl_ui/space_clip.py	2013-09-18 22:21:32 UTC (rev 60226)
@@ -373,10 +373,7 @@
         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 19:55:48 UTC (rev 60225)
+++ branches/soc-2013-motion_track/source/blender/makesdna/DNA_tracking_types.h	2013-09-18 22:21:32 UTC (rev 60226)
@@ -412,8 +412,7 @@
 /* MovieTrackingSettings->reconstruction_flag */
 enum {
 	TRACKING_USE_FALLBACK_RECONSTRUCTION = (1 << 0),
-	TRACKING_USE_KEYFRAME_SELECTION      = (1 << 1),
-	TRACKING_USE_MULTICAMERA_SOLVER      = (1 << 2)
+	TRACKING_USE_KEYFRAME_SELECTION      = (1 << 1)
 };
 
 /* 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 19:55:48 UTC (rev 60225)
+++ branches/soc-2013-motion_track/source/blender/makesrna/intern/rna_tracking.c	2013-09-18 22:21:32 UTC (rev 60226)
@@ -964,12 +964,6 @@
 	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);