[Bf-blender-cvs] [bee5c9720d0] soc-2020-io-performance: Merge branch 'master' into soc-2020-io-performance

[Howard Trickey]

Commit: bee5c9720d04c634d50475d907fcef8600d5e937
Author: Howard Trickey
Date:   Sun Mar 14 13:37:08 2021 -0400
Branches: soc-2020-io-performance
https://developer.blender.org/rBbee5c9720d04c634d50475d907fcef8600d5e937

Merge branch 'master' into soc-2020-io-performance

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



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

diff --cc release/scripts/startup/bl_ui/space_topbar.py
index f15848b0f19,7219922c379..bc7dc0dda03
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@@ -449,8 -475,7 +476,8 @@@ class TOPBAR_MT_file_export(Menu)
      bl_label = "Export"
      bl_owner_use_filter = False
  
-     def draw(self, context):
+     def draw(self, _context):
 +        self.layout.operator("wm.obj_export", text="Wavefront OBJ (.obj) - New")
          if bpy.app.build_options.collada:
              self.layout.operator("wm.collada_export",
                                   text="Collada (Default) (.dae)")