UI: Remove OpenGL Render operators from Render menu

Rendering OpenGL/Preview is accessible from each editor.
Render settings are accessible from the Film menu when in OpenGL/Preview engine.
It wasn't always predictable especially with Workspaces without or with many viewports.

Also reordering of items, renaming and removal of superfluous icons.

1 files changed, 5 insertions, 12 deletions

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 6712e495498..ecb59e322c2 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -394,26 +394,20 @@ class INFO_MT_render(Menu):
         props = layout.operator("render.render", text="Render Animation", icon='RENDER_ANIMATION')
         props.animation = True
         props.use_viewport = True
-        layout.operator("sound.mixdown", text="Render Audio", icon='PLAY_AUDIO')
 
         layout.separator()
 
-        layout.prop_menu_enum(rd, "display_mode", text="Display Mode")
-        layout.prop(rd, "use_lock_interface", text="Lock Interface")
+        layout.operator("sound.mixdown", text="Render Audio...")
 
         layout.separator()
 
-        props = layout.operator("render.opengl", text="OpenGL Render Image", icon='RENDER_STILL')
-        props.view_context = False
-        props = layout.operator("render.opengl", text="OpenGL Render Animation", icon='RENDER_ANIMATION')
-        props.view_context = False
-        props.animation = True
-        layout.menu("INFO_MT_opengl_render")
+        layout.operator("render.view_show", text="View Render")
+        layout.operator("render.play_rendered_anim", text="View Animation")
+        layout.prop_menu_enum(rd, "display_mode", text="Display Mode")
 
         layout.separator()
 
-        layout.operator("render.view_show")
-        layout.operator("render.play_rendered_anim", icon='PLAY')
+        layout.prop(rd, "use_lock_interface", text="Lock Interface")
 
 
 class INFO_MT_opengl_render(Menu):
@@ -616,7 +610,6 @@ classes = (
     INFO_MT_edit,
     INFO_MT_game,
     INFO_MT_render,
-    INFO_MT_opengl_render,
     INFO_MT_window,
     INFO_MT_help,
 )