[Bf-blender-cvs] [200d8a17329] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 200d8a1732901ba769b30670dadafb6ad3a89ba2
Author: Antonio Vazquez
Date:   Fri Dec 13 16:27:29 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB200d8a1732901ba769b30670dadafb6ad3a89ba2

Merge branch 'master' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_topbar.py
index 166c93efd20,e69a28d69bf..ab79d0483cb
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@@ -768,8 -815,10 +793,9 @@@ classes = 
      TOPBAR_MT_window,
      TOPBAR_MT_help,
      TOPBAR_PT_tool_fallback,
+     TOPBAR_PT_tool_settings_extra,
      TOPBAR_PT_gpencil_layers,
      TOPBAR_PT_gpencil_primitive,
 -    TOPBAR_PT_gpencil_fill,
      TOPBAR_PT_name,
  )