diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 10 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 11 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_tracking_types.h | 5 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 16 |
4 files changed, 2 insertions, 40 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index b8711f6e5f6..c7fea98d7cf 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -212,7 +212,6 @@ void BKE_tracking_settings_init(MovieTracking *tracking) tracking->settings.default_algorithm_flag |= TRACK_ALGORITHM_FLAG_USE_BRUTE; tracking->settings.dist = 1; tracking->settings.object_distance = 1; - tracking->settings.reconstruction_success_threshold = 1e-3f; tracking->stabilization.scaleinf = 1.0f; tracking->stabilization.locinf = 1.0f; @@ -3473,9 +3472,6 @@ typedef struct MovieReconstructContext { TracksMap *tracks_map; - float success_threshold; - bool use_fallback_reconstruction; - int sfra, efra; } MovieReconstructContext; @@ -3780,9 +3776,6 @@ MovieReconstructContext *BKE_tracking_reconstruction_context_new(MovieTracking * context->k2 = camera->k2; context->k3 = camera->k3; - context->success_threshold = tracking->settings.reconstruction_success_threshold; - context->use_fallback_reconstruction = tracking->settings.reconstruction_flag & TRACKING_USE_FALLBACK_RECONSTRUCTION; - context->tracks_map = tracks_map_new(context->object_name, context->is_camera, num_tracks, 0); track = tracksbase->first; @@ -3877,9 +3870,6 @@ static void reconstructionOptionsFromContext(libmv_ReconstructionOptions *recons reconstruction_options->keyframe2 = context->keyframe2; reconstruction_options->refine_intrinsics = context->refine_flags; - - reconstruction_options->success_threshold = context->success_threshold; - reconstruction_options->use_fallback_reconstruction = context->use_fallback_reconstruction; } /* Solve camera/object motion and reconstruct 3D markers position diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c4db8b188b2..2cc5aa33ab6 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9089,17 +9089,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } - - /* fallbck resection method settings */ - { - MovieClip *clip; - - for (clip = main->movieclip.first; clip; clip = clip->id.next) { - if (clip->tracking.settings.reconstruction_success_threshold == 0.0f) { - clip->tracking.settings.reconstruction_success_threshold = 1e-3f; - } - } - } } if (main->versionfile < 264 || (main->versionfile == 264 && main->subversionfile < 7)) { diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 49c1e3ed35d..65d36adde18 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -207,8 +207,7 @@ typedef struct MovieTrackingSettings { * were moved to per-tracking object settings */ - float reconstruction_success_threshold; - int reconstruction_flag; + int reconstruction_flag, pad; /* which camera intrinsics to refine. uses on the REFINE_* flags */ short refine_camera_intrinsics, pad2; @@ -409,7 +408,7 @@ enum { /* MovieTrackingSettings->reconstruction_flag */ enum { - TRACKING_USE_FALLBACK_RECONSTRUCTION = (1 << 0), + /* TRACKING_USE_FALLBACK_RECONSTRUCTION = (1 << 0), */ /* DEPRECATED */ TRACKING_USE_KEYFRAME_SELECTION = (1 << 1) }; diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 97f5c24dc56..8e26bb96a1f 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -767,22 +767,6 @@ static void rna_def_trackingSettings(BlenderRNA *brna) "Limit speed of tracking to make visual feedback easier " "(this does not affect the tracking quality)"); - /* reconstruction success_threshold */ - prop = RNA_def_property(srna, "reconstruction_success_threshold", PROP_FLOAT, PROP_NONE); - RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_float_default(prop, 0.001f); - RNA_def_property_range(prop, 0, FLT_MAX); - RNA_def_property_ui_text(prop, "Success Threshold", - "Threshold value of reconstruction error which is still considered successful"); - - /* use fallback reconstruction */ - prop = RNA_def_property(srna, "use_fallback_reconstruction", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_boolean_sdna(prop, NULL, "reconstruction_flag", TRACKING_USE_FALLBACK_RECONSTRUCTION); - RNA_def_property_ui_text(prop, "Use Fallback", - "Use fallback reconstruction algorithm in cases main reconstruction algorithm failed " - "(could give better solution with bad tracks)"); - /* use keyframe selection */ prop = RNA_def_property(srna, "use_keyframe_selection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); |