Camera tracking: move margin, frames limit and adjust frames to per-track settings

Also replace adjust frames integer slider with menu to choose between matching
pattern from keyframe position of from previous frame. think this settings
wouldn't be so confusing now.

5 files changed, 26 insertions, 6 deletions

diff --git a/release/scripts/presets/tracking_settings/blurry_movie.py b/release/scripts/presets/tracking_settings/blurry_movie.py
index ad965337937..8a503bec9bd 100644
--- a/release/scripts/presets/tracking_settings/blurry_movie.py
+++ b/release/scripts/presets/tracking_settings/blurry_movie.py
@@ -6,3 +6,6 @@ settings.default_pyramid_levels = 4
 settings.default_correlation_min = 0.75
 settings.default_pattern_size = 11
 settings.default_search_size = 202
+settings.default_frames_limit = 25
+settings.default_pattern_match = 'KEYFRAME'
+settings.default_margin = 0
diff --git a/release/scripts/presets/tracking_settings/default.py b/release/scripts/presets/tracking_settings/default.py
index 4f1e23fb65c..4b2d41bf292 100644
--- a/release/scripts/presets/tracking_settings/default.py
+++ b/release/scripts/presets/tracking_settings/default.py
@@ -6,3 +6,6 @@ settings.default_pyramid_levels = 2
 settings.default_correlation_min = 0.75
 settings.default_pattern_size = 11
 settings.default_search_size = 51
+settings.default_frames_limit = 0
+settings.default_pattern_match = 'KEYFRAME'
+settings.default_margin = 0
diff --git a/release/scripts/presets/tracking_settings/fast_motion.py b/release/scripts/presets/tracking_settings/fast_motion.py
index 0ca768adef2..a3d382e6700 100644
--- a/release/scripts/presets/tracking_settings/fast_motion.py
+++ b/release/scripts/presets/tracking_settings/fast_motion.py
@@ -6,3 +6,6 @@ settings.default_pyramid_levels = 2
 settings.default_correlation_min = 0.75
 settings.default_pattern_size = 11
 settings.default_search_size = 121
+settings.default_frames_limit = 0
+settings.default_pattern_match = 'KEYFRAME'
+settings.default_margin = 0
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 1eeae28783e..a5c8c280616 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -376,6 +376,9 @@ class AddPresetTrackingSettings(AddPresetBase, Operator):
         "settings.default_correlation_min",
         "settings.default_pattern_size",
         "settings.default_search_size",
+        "settings.default_frames_limit",
+        "settings.default_pattern_match",
+        "settings.default_margin"
     ]
 
     preset_subdir = "tracking_settings"
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index dbfa6a24ec3..22d44ed4793 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -132,6 +132,15 @@ class CLIP_PT_tools_marker(Panel):
             else:
                 col.prop(settings, "default_correlation_min")
 
+            col.separator()
+
+            col2 = col.column(align=True)
+            col2.prop(settings, "default_frames_limit")
+            col2.prop(settings, "default_margin")
+
+            col.label(text="Match:")
+            col.prop(settings, "default_pattern_match", text="")
+
 
 class CLIP_PT_tools_tracking(Panel):
     bl_space_type = 'CLIP_EDITOR'
@@ -492,12 +501,11 @@ class CLIP_PT_track_settings(Panel):
                 col.prop(active, "correlation_min")
 
             col.separator()
-            col.label(text="Global Settings:")
+            col.prop(active, "frames_limit")
+            col.prop(active, "margin")
+            col.prop(active, "pattern_match", text="Match")
 
         col.prop(settings, "speed")
-        col.prop(settings, "frames_adjust")
-        col.prop(settings, "frames_limit")
-        col.prop(settings, "margin")
 
 
 class CLIP_PT_stabilization(Panel):
@@ -906,8 +914,8 @@ class CLIP_MT_track_color_presets(Menu):
 
 
 class CLIP_MT_tracking_settings_presets(Menu):
-    """Predefined track color"""
-    bl_label = "Tracking Settings"
+    """Predefined tracking settings"""
+    bl_label = "Tracking Presets"
     preset_subdir = "tracking_settings"
     preset_operator = "script.execute_preset"
     draw = bpy.types.Menu.draw_preset