Revert "UI: remove 'Render' top level menu"

This reverts commit 10e43c0aef38647d8904e758e36261c9ac0b6460.

After discussion, it's useful to have render menu
for more obscure render options.

3 files changed, 27 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index b3b318f339e..93de404245f 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -86,11 +86,8 @@ class RENDER_PT_render(RenderButtonsPanel, Panel):
 
         row = layout.row(align=True)
         row.operator("render.render", text="Render", icon='RENDER_STILL')
-        row.operator("sound.mixdown", text="Audio", icon='PLAY_AUDIO')
-
-        row = layout.row(align=True)
         row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
-        row.operator("render.play_rendered_anim", text="Play Animation", icon='PLAY')
+        row.operator("sound.mixdown", text="Audio", icon='PLAY_AUDIO')
 
         split = layout.split(percentage=0.33)
 
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 637426a8a77..44c931443a4 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -402,6 +402,8 @@ class INFO_MT_editor_menus(Menu):
         layout.menu("INFO_MT_file")
         layout.menu("INFO_MT_edit")
 
+        layout.menu("INFO_MT_render")
+
         layout.menu("INFO_MT_window")
         layout.menu("INFO_MT_help")
 
@@ -545,6 +547,29 @@ class INFO_MT_game(Menu):
         layout.prop(gs, "use_auto_start")
 
 
+class INFO_MT_render(Menu):
+    bl_label = "Render"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator("render.render", text="Render Image", icon='RENDER_STILL').use_viewport = True
+        props = layout.operator("render.render", text="Render Animation", icon='RENDER_ANIMATION')
+        props.animation = True
+        props.use_viewport = True
+
+        layout.separator()
+
+        layout.operator("render.opengl", text="OpenGL Render Image")
+        layout.operator("render.opengl", text="OpenGL Render Animation").animation = True
+        layout.menu("INFO_MT_opengl_render")
+
+        layout.separator()
+
+        layout.operator("render.view_show")
+        layout.operator("render.play_rendered_anim", icon='PLAY')
+
+
 class INFO_MT_opengl_render(Menu):
     bl_label = "OpenGL Render Options"
 
@@ -591,7 +616,6 @@ class INFO_MT_window(Menu):
         layout = self.layout
 
         layout.operator("wm.window_new")
-        layout.operator("render.view_show")
         layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER')
 
         layout.separator()
@@ -664,6 +688,7 @@ classes = (
     INFO_MT_file_previews,
     INFO_MT_edit,
     INFO_MT_game,
+    INFO_MT_render,
     INFO_MT_opengl_render,
     INFO_MT_window,
     INFO_MT_help,
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 6dd344fe32c..eb4eb7dee05 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -446,7 +446,6 @@ class VIEW3D_MT_view(Menu):
 
         layout.operator("render.opengl", icon='RENDER_STILL')
         layout.operator("render.opengl", text="OpenGL Render Animation", icon='RENDER_ANIMATION').animation = True
-        layout.menu("INFO_MT_opengl_render")
 
         layout.separator()