[Bf-blender-cvs] [1e5377bdcfe] tracking_tools: MCE: Fix default tracking settings extras

[Sebastian Koenig]

Commit: 1e5377bdcfeb0937ae04fa2925703ab34d6b11d5
Author: Sebastian Koenig
Date:   Thu Jul 15 13:59:22 2021 +0200
Branches: tracking_tools
https://developer.blender.org/rB1e5377bdcfeb0937ae04fa2925703ab34d6b11d5

MCE: Fix default tracking settings extras

The default tracking settings popover was using the tracking settings
extras panel from the actve track, not the default one.

===================================================================

M	release/scripts/startup/bl_ui/space_clip.py
M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 7c3528af0e2..03a12354848 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -949,7 +949,7 @@ class CLIP_PT_track_settings_tool(CLIP_PT_tracking_panel, Panel):
     def poll(cls, context):
         clip = context.space_data.clip
 
-        return clip.tracking.tracks.active
+        return clip
 
     def draw(self, context):
         layout = self.layout
@@ -957,16 +957,15 @@ class CLIP_PT_track_settings_tool(CLIP_PT_tracking_panel, Panel):
         layout.use_property_decorate = False
 
         clip = context.space_data.clip
-        active = clip.tracking.tracks.active
         settings = clip.tracking.settings
 
         col = layout.column(align=True)
-        col.prop(active, "correlation_min")
-        col.prop(active, "margin")
+        col.prop(settings, "default_correlation_min")
+        col.prop(settings, "default_margin")
 
         col = layout.column()
-        col.prop(active, "use_mask")
-        col.prop(active, "frames_limit")
+        col.prop(settings, "default_frames_limit")
+        col.prop(settings, "use_default_mask")
 
 
 class CLIP_PT_track_settings_extras(CLIP_PT_tracking_panel, Panel):
@@ -997,8 +996,8 @@ class CLIP_PT_track_settings_extras(CLIP_PT_tracking_panel, Panel):
         col.prop(active, "margin")
 
         col = layout.column()
-        col.prop(active, "use_mask")
         col.prop(active, "frames_limit")
+        col.prop(active, "use_mask")
 
 
 class CLIP_PT_tracking_camera(Panel):
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index f0235b09e5c..13869b2a0fe 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -2413,6 +2413,7 @@ class _defs_clip_tracking_tools:
             row.prop(props, "use_default_green_channel", text="G", toggle=True)
             row.prop(props, "use_default_blue_channel", text="B", toggle=True)
             row = layout.row()
+            row.prop(props, "default_weight")
             row.popover(panel="CLIP_PT_track_settings_tool")
 
         return dict(