UI: remove 'Render' top level menu

- Toggle render window is in the window menu.
- OpenGL render settings in the 3D View menu.
- Playback animation in the render panel.

3 files changed, 6 insertions, 27 deletions

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 93de404245f..b3b318f339e 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -86,9 +86,12 @@ class RENDER_PT_render(RenderButtonsPanel, Panel):
 
         row = layout.row(align=True)
         row.operator("render.render", text="Render", icon='RENDER_STILL')
-        row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
         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')
+
         split = layout.split(percentage=0.33)
 
         split.label(text="Display:")
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 4eabf2bf327..386ed9d381d 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -401,8 +401,6 @@ class INFO_MT_editor_menus(Menu):
     def draw_menus(layout, context):
         layout.menu("INFO_MT_file")
 
-        layout.menu("INFO_MT_render")
-
         layout.menu("INFO_MT_window")
         layout.menu("INFO_MT_help")
 
@@ -548,29 +546,6 @@ 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"
 
@@ -594,6 +569,7 @@ 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()
@@ -665,7 +641,6 @@ classes = (
     INFO_MT_file_external_data,
     INFO_MT_file_previews,
     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 3f389be78b9..1edee555eb6 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -446,6 +446,7 @@ 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()