[Bf-blender-cvs] [935c717e710] tracking_tools: Merge branch 'master' into tracking_tools

[Sebastian Koenig]

Commit: 935c717e710cc0b5215572bfa4ba1f4ace0684d1
Author: Sebastian Koenig
Date:   Wed Aug 11 14:40:09 2021 +0200
Branches: tracking_tools
https://developer.blender.org/rB935c717e710cc0b5215572bfa4ba1f4ace0684d1

Merge branch 'master' into tracking_tools

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



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

diff --cc release/scripts/startup/bl_ui/space_clip.py
index f88e67f9e95,a1e5b509295..9b4f8b26655
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -1289,8 -1196,25 +1314,13 @@@ class CLIP_PT_active_mask_point(MASK_PT
  class CLIP_PT_mask(MASK_PT_mask, Panel):
      bl_space_type = 'CLIP_EDITOR'
      bl_region_type = 'UI'
 -    bl_category = "Mask"
 -
 -
 -class CLIP_PT_tools_mask_transforms(MASK_PT_transforms, Panel):
 -    bl_space_type = 'CLIP_EDITOR'
 -    bl_region_type = 'TOOLS'
 -    bl_category = "Mask"
 -
 -
 -class CLIP_PT_tools_mask_tools(MASK_PT_tools, Panel):
 -    bl_space_type = 'CLIP_EDITOR'
 -    bl_region_type = 'TOOLS'
 -    bl_category = "Mask"
 +    bl_category = 'Mask'
  
+ 
+ class CLIP_PT_mask_display(MASK_PT_display, Panel):
+     bl_space_type = 'CLIP_EDITOR'
+     bl_region_type = 'HEADER'
+ 
  # --- end mask ---