[Bf-blender-cvs] [85fb2da9b1e] usd-importer-T81257-merge: Merge branch 'master' of https://gitlab-master.nvidia.com/omniverse/blender into usd-importer-T81257-merge

[makowalski]

Commit: 85fb2da9b1e55a55610cecc841770556a2385232
Author: makowalski
Date:   Fri Apr 9 14:00:42 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB85fb2da9b1e55a55610cecc841770556a2385232

Merge branch 'master' of https://gitlab-master.nvidia.com/omniverse/blender into usd-importer-T81257-merge

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



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

diff --cc release/scripts/startup/bl_ui/space_topbar.py
index 02cc4cc4266,adab0b0c88a..516bcd6c01d
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@@ -441,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"