[Bf-blender-cvs] [6f4a077b736] temp-gpencil-io: Remove Submenu for Import/Export

[Antonio Vazquez]

Commit: 6f4a077b73615e60e22c15928251549dd83d643b
Author: Antonio Vazquez
Date:   Tue Mar 23 17:31:44 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rB6f4a077b73615e60e22c15928251549dd83d643b

Remove Submenu for Import/Export

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

M	release/scripts/startup/bl_ui/space_topbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 57f30ce6aad..adab0b0c88a 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -469,30 +469,7 @@ class TOPBAR_MT_file_import(Menu):
         if bpy.app.build_options.alembic:
             self.layout.operator("wm.alembic_import", text="Alembic (.abc)")
 
-        self.layout.menu("TOPBAR_MT_file_gpencil_import")
-
-
-class TOPBAR_MT_file_gpencil_import(Menu):
-    bl_idname = "TOPBAR_MT_file_gpencil_import"
-    bl_label = "Grease Pencil"
-    bl_owner_use_filter = False
-
-    def draw(self, context):
-        self.layout.operator("wm.gpencil_import_svg", text="Scalable Vector Graphics (.svg)")
-
-
-class TOPBAR_MT_file_gpencil_export(Menu):
-    bl_idname = "TOPBAR_MT_file_gpencil_export"
-    bl_label = "Grease Pencil"
-    bl_owner_use_filter = False
-
-    def draw(self, context):
-        # Pugixml lib dependency
-        if bpy.app.build_options.pugixml:
-            self.layout.operator("wm.gpencil_export_svg", text="Scalable Vector Graphics (.svg)")
-        # Haru lib dependency
-        if bpy.app.build_options.haru:
-            self.layout.operator("wm.gpencil_export_pdf", text="Portable Document Format (.pdf)")
+        self.layout.operator("wm.gpencil_import_svg", text="SVG as Grease Pencil")
 
 
 class TOPBAR_MT_file_export(Menu):
@@ -510,7 +487,12 @@ class TOPBAR_MT_file_export(Menu):
             self.layout.operator(
                 "wm.usd_export", text="Universal Scene Description (.usd, .usdc, .usda)")
 
-        self.layout.menu("TOPBAR_MT_file_gpencil_export")
+        # Pugixml lib dependency
+        if bpy.app.build_options.pugixml:
+            self.layout.operator("wm.gpencil_export_svg", text="Grease Pencil as SVG")
+        # Haru lib dependency
+        if bpy.app.build_options.haru:
+            self.layout.operator("wm.gpencil_export_pdf", text="Grease Pencil as PDF")
 
 
 class TOPBAR_MT_file_external_data(Menu):
@@ -870,9 +852,7 @@ classes = (
     TOPBAR_MT_file_recover,
     TOPBAR_MT_file_defaults,
     TOPBAR_MT_templates_more,
-    TOPBAR_MT_file_gpencil_import,
     TOPBAR_MT_file_import,
-    TOPBAR_MT_file_gpencil_export,
     TOPBAR_MT_file_export,
     TOPBAR_MT_file_external_data,
     TOPBAR_MT_file_cleanup,