[Bf-blender-cvs] [27e2382feb2] tracking_tools: MCE: Only show marker settings with active clip
Sebastian Koenig
noreply at git.blender.org
Tue Jul 20 11:16:24 CEST 2021
Commit: 27e2382feb2cdf899c4ab4ae40e9fa17502a507d
Author: Sebastian Koenig
Date: Tue Jul 20 09:59:21 2021 +0200
Branches: tracking_tools
https://developer.blender.org/rB27e2382feb2cdf899c4ab4ae40e9fa17502a507d
MCE: Only show marker settings with active clip
When no clip was loaded, draw the add_marker_tweak tool options gave an
error. So only draw them when a clip is open.
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index d1cc1cfbe95..31179d159ad 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -2396,28 +2396,29 @@ class _defs_clip_tracking_tools:
@ToolDef.from_fn
def add_marker_tweak():
def draw_settings(_context, layout, tool):
- # props = tool.operator_properties("sequencer.split")
- props = _context.space_data.clip.tracking.settings
- # layout.use_property_split = True
- row = layout.row(align=True)
- row.prop(props, "default_pattern_size", text="")
- row.prop(props, "default_search_size", text="")
- row = layout.row()
- row.ui_units_x = 5
- row.prop(props, "default_motion_model", text="")
- row = layout.row()
- row.ui_units_x = 5
- row.prop(props, "default_pattern_match", text="")
- row = layout.row()
- row.prop(props, "use_default_brute")
- row.prop(props, "use_default_normalization")
- row = layout.row(align=True)
- row.prop(props, "use_default_red_channel", text="R", toggle=True)
- 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")
+ clip = _context.space_data.clip
+ if clip:
+ settings = clip.tracking.settings
+ # layout.use_property_split = True
+ row = layout.row(align=True)
+ row.prop(settings, "default_pattern_size", text="")
+ row.prop(settings, "default_search_size", text="")
+ row = layout.row()
+ row.ui_units_x = 5
+ row.prop(settings, "default_motion_model", text="")
+ row = layout.row()
+ row.ui_units_x = 5
+ row.prop(settings, "default_pattern_match", text="")
+ row = layout.row()
+ row.prop(settings, "use_default_brute")
+ row.prop(settings, "use_default_normalization")
+ row = layout.row(align=True)
+ row.prop(settings, "use_default_red_channel", text="R", toggle=True)
+ row.prop(settings, "use_default_green_channel", text="G", toggle=True)
+ row.prop(settings, "use_default_blue_channel", text="B", toggle=True)
+ row = layout.row()
+ row.prop(settings, "default_weight")
+ row.popover(panel="CLIP_PT_track_settings_tool")
return dict(
idname="builtin.add_marker_tweak",
More information about the Bf-blender-cvs
mailing list