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

[Sergey Sharybin]

Commit: a9b204c501be8a61c03ac45ab25c3d84cb7c9a76
Author: Sergey Sharybin
Date:   Mon May 9 16:15:01 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rBa9b204c501be8a61c03ac45ab25c3d84cb7c9a76

Merge branch 'master' into tracking_tools

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



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

diff --cc release/scripts/startup/bl_ui/space_image.py
index b53850f601d,d61055c9024..ed10f1554d6
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@@ -814,12 -806,13 +814,19 @@@ class IMAGE_HT_header(Header)
  
          layout.separator_spacer()
  
 +        # Masking
 +        if show_maskedit:
 +            row = layout.row()
 +            row.template_ID(sima, "mask", new="mask.new")
 +            row.popover(panel='IMAGE_PT_mask_display')
 +
+         # Gizmo toggle & popover.
+         row = layout.row(align=True)
+         row.prop(sima, "show_gizmo", icon='GIZMO', text="")
+         sub = row.row(align=True)
+         sub.active = sima.show_gizmo
+         sub.popover(panel="IMAGE_PT_gizmo_display", text="")
+ 
          # Overlay toggle & popover
          row = layout.row(align=True)
          row.prop(overlay, "show_overlays", icon='OVERLAY', text="")
diff --cc source/blender/windowmanager/WM_toolsystem.h
index cb8b77f5628,96094e9e7ef..f1d2ce8eb61
--- a/source/blender/windowmanager/WM_toolsystem.h
+++ b/source/blender/windowmanager/WM_toolsystem.h
@@@ -27,8 -27,12 +27,13 @@@ struct wmOperatorType
  /* wm_toolsystem.c */
  
  #define WM_TOOLSYSTEM_SPACE_MASK \
 -  ((1 << SPACE_IMAGE) | (1 << SPACE_NODE) | (1 << SPACE_VIEW3D) | (1 << SPACE_SEQ))
 +  ((1 << SPACE_IMAGE) | (1 << SPACE_NODE) | (1 << SPACE_VIEW3D) | (1 << SPACE_SEQ) | \
 +   (1 << SPACE_CLIP))
+ /**
+  * Space-types that define their own "mode" (as returned by #WM_toolsystem_mode_from_spacetype).
+  */
+ #define WM_TOOLSYSTEM_SPACE_MASK_MODE_FROM_SPACE ((1 << SPACE_IMAGE) | (1 << SPACE_SEQ))
+ 
  /* Values that define a category of active tool. */
  typedef struct bToolKey {
    int space_type;