[Bf-blender-cvs] [7b615a2dfb0] tracking_tools: Merge branch 'master' into tracking_tools

[Sebastian Koenig]

Commit: 7b615a2dfb09e26e000c8f3ab194681e1ef7c610
Author: Sebastian Koenig
Date:   Sat Sep 25 09:37:10 2021 +0200
Branches: tracking_tools
https://developer.blender.org/rB7b615a2dfb09e26e000c8f3ab194681e1ef7c610

Merge branch 'master' into tracking_tools

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



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

diff --cc release/scripts/startup/bl_ui/space_clip.py
index 09926998a37,c18d77987ad..77d7efa898f
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -219,10 -138,6 +219,10 @@@ class CLIP_HT_header(Header)
  
          layout.separator_spacer()
  
 +        if not show_region_tool_header:
-             if not sc.view == 'CLIP':
++            if sc.view == 'CLIP':
 +                CLIP_HT_header.draw_xform_template(layout, context)
 +
          row = layout.row()
          if sc.view == 'CLIP':
              row.template_ID(sc, "clip", open="clip.open")