From 5a1cef2e763f70230259433423cd33a644e46218 Mon Sep 17 00:00:00 2001
From: William Reynish <billreynish>
Date: Mon, 25 Jan 2021 17:49:02 +1100
Subject: UI: move 'Trace Image to Grease Pencil' to 'Convert' sub-menu

This operator is very specific, and may not warrant being placed in
such a prominent place. Move it together with other convert operators.

Ref D10188
---
 release/scripts/startup/bl_ui/space_view3d.py | 29 ++++++++++++++++++---------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'release/scripts/startup/bl_ui/space_view3d.py')

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 28d0b59590a..10606889ece 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2287,16 +2287,7 @@ class VIEW3D_MT_object(Menu):
 
         layout.separator()
 
-        ob = context.active_object
-        if ob and ob.type == 'GPENCIL' and context.gpencil_data:
-            layout.operator_menu_enum("gpencil.convert", "type", text="Convert To")
-        else:
-            layout.operator_menu_enum("object.convert", "target")
-
-        # Potrace lib dependency
-        if bpy.app.build_options.potrace:
-            layout.separator()
-            layout.operator("gpencil.trace_image")
+        layout.menu("VIEW3D_MT_object_convert")
 
         layout.separator()
 
@@ -2781,6 +2772,23 @@ class VIEW3D_MT_make_single_user(Menu):
         props.object = props.obdata = props.material = False
 
 
+class VIEW3D_MT_object_convert(Menu):
+    bl_label = "Convert"
+
+    def draw(self, context):
+        layout = self.layout
+        ob = context.active_object
+
+        if ob and ob.type == 'GPENCIL' and context.gpencil_data:
+            layout.operator_enum("gpencil.convert", "type")
+        else:
+            layout.operator_enum("object.convert", "target")
+
+        # Potrace lib dependency.
+        if bpy.app.build_options.potrace:
+            layout.operator("gpencil.trace_image", icon='OUTLINER_OB_GREASEPENCIL')
+
+
 class VIEW3D_MT_make_links(Menu):
     bl_label = "Link/Transfer Data"
 
@@ -7525,6 +7533,7 @@ classes = (
     VIEW3D_MT_object_rigid_body,
     VIEW3D_MT_object_clear,
     VIEW3D_MT_object_context_menu,
+    VIEW3D_MT_object_convert,
     VIEW3D_MT_object_shading,
     VIEW3D_MT_object_apply,
     VIEW3D_MT_object_relations,
-- 
cgit v1.2.3