UI: Move OpenGL Settings (AA and Alpha) into the Info Editor render menu.

2 files changed, 14 insertions, 22 deletions

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index da334e208b7..c54ff8ae2d1 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -316,28 +316,6 @@ class CyclesRender_PT_performance(CyclesButtonsPanel, Panel):
         col.prop(cscene, "debug_use_spatial_splits")
 
 
-class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel):
-    bl_label = "OpenGL Render"
-    bl_options = {'DEFAULT_CLOSED'}
-
-    def draw(self, context):
-        layout = self.layout
-
-        rd = context.scene.render
-
-        split = layout.split()
-
-        col = split.column()
-        col.prop(rd, "use_antialiasing")
-        sub = col.row()
-        sub.active = rd.use_antialiasing
-        sub.prop(rd, "antialiasing_samples", expand=True)
-
-        col = split.column()
-        col.label(text="Alpha:")
-        col.prop(rd, "alpha_mode", text="")
-
-
 class CyclesRender_PT_layer_options(CyclesButtonsPanel, Panel):
     bl_label = "Layer"
     bl_context = "render_layer"
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index f5106ddfcdf..01692c9a5b7 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -233,6 +233,7 @@ class INFO_MT_render(Menu):
 
         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()
 
@@ -240,6 +241,19 @@ class INFO_MT_render(Menu):
         layout.operator("render.play_rendered_anim", icon='PLAY')
 
 
+class INFO_MT_opengl_render(Menu):
+    bl_label = "OpenGL Render Options"
+
+    def draw(self, context):
+        layout = self.layout
+        
+        rd = context.scene.render
+
+        layout.prop(rd, "use_antialiasing")
+        layout.prop_menu_enum(rd, "antialiasing_samples")
+        layout.prop_menu_enum(rd, "alpha_mode")
+
+
 class INFO_MT_window(Menu):
     bl_label = "Window"