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

[Aaron Carlisle]

Commit: 7d9fc377e18e844096391f90c0024ae3c7acde4b
Author: Aaron Carlisle
Date:   Mon Jul 26 19:03:34 2021 -0400
Branches: tracking_tools
https://developer.blender.org/rB7d9fc377e18e844096391f90c0024ae3c7acde4b

Merge branch 'master' into tracking_tools

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



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

diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index fd45b7cd337,46a6944d2ea..567d47b2537
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -191,15 -191,12 +191,18 @@@ class _defs_annotate
                  row.prop(tool_settings.gpencil_sculpt, "lockaxis")
              elif tool_settings.gpencil_stroke_placement_view3d in {'SURFACE', 'STROKE'}:
                  row.prop(tool_settings, "use_gpencil_stroke_endpoints")
+         elif space_type in {'IMAGE_EDITOR', 'NODE_EDITOR', 'SEQUENCE_EDITOR', 'CLIP_EDITOR'}:
+             layout.separator()
+ 
+             row = layout.row(align=True)
+             row.prop(tool_settings, "annotation_stroke_placement_view2d", text="Placement")
++        
 +        if space_type == 'CLIP_EDITOR':
 +            layout.separator()
 +            row = layout.row(align=True)
 +            row.label(text="Data Source:")
 +            row.prop(context.space_data, "annotation_source", expand=True)
  
-             if context.space_data.annotation_source == 'CLIP':
-                 row = layout.row(align=True)
-                 row.prop(tool_settings, "annotation_stroke_placement_view2d", text="Placement")
          if tool.idname == "builtin.annotate_line":
              layout.separator()