[Bf-blender-cvs] [d1377f7ab14] vfx-clip-ui-update: Merge branch 'arcpatch-D9807' into vfx-clip-ui-update

[Aaron Carlisle]

Commit: d1377f7ab14a2a9e3f6abe85a450f4f724de57bd
Author: Aaron Carlisle
Date:   Tue Jan 5 22:52:24 2021 -0500
Branches: vfx-clip-ui-update
https://developer.blender.org/rBd1377f7ab14a2a9e3f6abe85a450f4f724de57bd

Merge branch 'arcpatch-D9807' into vfx-clip-ui-update

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



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

diff --cc release/scripts/startup/bl_ui/space_clip.py
index 52f0c238546,10db09cd1e6..1da6c66b722
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -1764,11 -1794,8 +1795,9 @@@ classes = 
      CLIP_PT_tools_object,
      CLIP_PT_objects,
      CLIP_PT_plane_track,
-     CLIP_PT_track_settings,
-     CLIP_PT_track_settings_extras,
      CLIP_PT_tracking_camera,
      CLIP_PT_tracking_lens,
 +    CLIP_PT_tracking_solve,
      CLIP_PT_marker,
      CLIP_PT_proxy,
      CLIP_PT_footage,