[Bf-blender-cvs] [68d948a4f9b] vfx-clip-ui-update: Merge branch 'arcpatch-D9806' into vfx-clip-ui-update

[Aaron Carlisle]

Commit: 68d948a4f9bfc6c71a7caf1294eef07783db990a
Author: Aaron Carlisle
Date:   Tue Jan 5 22:56:20 2021 -0500
Branches: vfx-clip-ui-update
https://developer.blender.org/rB68d948a4f9bfc6c71a7caf1294eef07783db990a

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

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



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

diff --cc release/scripts/startup/bl_ui/space_clip.py
index 1da6c66b722,a7c6ff2da9f..de5d2de5082
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -1792,12 -1725,12 +1771,11 @@@ classes = 
      CLIP_PT_tools_cleanup,
      CLIP_PT_tools_geometry,
      CLIP_PT_tools_orientation,
-     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,