diff options
author | Joseph Mansfield <sftrabbit@gmail.com> | 2013-09-19 02:21:32 +0400 |
---|---|---|
committer | Joseph Mansfield <sftrabbit@gmail.com> | 2013-09-19 02:21:32 +0400 |
commit | 9c6a60ab607884d80daec1f6ed0736de70bfc54c (patch) | |
tree | 216e20a4f35ec2e7286825adf0f090ddc17b8889 | |
parent | d7e23e178335c70a1817cd5e47c59ab3dcf03352 (diff) |
Remove multicamera solver option
Reverting the previous commit because Sergey threatened puppies with an axe for every time I add an option.
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_tracking_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 6 |
3 files changed, 1 insertions, 11 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 7446df1bfd0..e853d6c1c1c 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -373,9 +373,6 @@ class CLIP_PT_tools_solve(CLIP_PT_tracking_panel, Panel): 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' diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 0f937169a3a..e3f45bad8a8 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -412,8 +412,7 @@ enum { /* 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 */ diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 401339d6a61..c3b14636e49 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -964,12 +964,6 @@ static void rna_def_trackingSettings(BlenderRNA *brna) 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); |