Commit: d4067bc8a7d74bc28b11075319756ac7f02634fc
Author: Antonio Vazquez
Date: Wed Mar 24 16:22:37 2021 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd4067bc8a7d74bc28b11075319756ac7f02634fc
GPencil: Fix merge errors
===================================================================
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 4bf0b9bfafb..adab0b0c88a 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -852,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,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
