[Bf-blender-cvs] [2bd8b493868] temp-usd-importer-T81257-merge: Merge remote-tracking branch 'origin/master' into temp-usd-importer-T81257-merge

[Dalai Felinto]

Commit: 2bd8b49386877cbe7c4f731ef7ea61240acd137e
Author: Dalai Felinto
Date:   Fri Apr 9 11:17:52 2021 +0200
Branches: temp-usd-importer-T81257-merge
https://developer.blender.org/rB2bd8b49386877cbe7c4f731ef7ea61240acd137e

Merge remote-tracking branch 'origin/master' into temp-usd-importer-T81257-merge

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



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

diff --cc release/scripts/startup/bl_ui/space_topbar.py
index 2d4a921fb69,adab0b0c88a..516bcd6c01d
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@@ -468,10 -468,9 +468,12 @@@ class TOPBAR_MT_file_import(Menu)
                                   text="Collada (Default) (.dae)")
          if bpy.app.build_options.alembic:
              self.layout.operator("wm.alembic_import", text="Alembic (.abc)")
 +        if bpy.app.build_options.usd:
 +            self.layout.operator(
 +                "wm.usd_import", text="Universal Scene Description (.usd, .usdc, .usda)")
  
+         self.layout.operator("wm.gpencil_import_svg", text="SVG as Grease Pencil")
+ 
  
  class TOPBAR_MT_file_export(Menu):
      bl_idname = "TOPBAR_MT_file_export"