[Bf-blender-cvs] [13ae541] master: UI: Move OpenGL Settings (AA and Alpha) into the Info Editor render menu.
Thomas Dinges
noreply at git.blender.org
Sat Mar 15 17:38:04 CET 2014
Commit: 13ae541be4d4c04986b8954c4c30c57dcda59400
Author: Thomas Dinges
Date: Sat Mar 15 16:47:03 2014 +0100
https://developer.blender.org/rB13ae541be4d4c04986b8954c4c30c57dcda59400
UI: Move OpenGL Settings (AA and Alpha) into the Info Editor render menu.
===================================================================
M intern/cycles/blender/addon/ui.py
M release/scripts/startup/bl_ui/space_info.py
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index da334e2..c54ff8a 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 f5106dd..01692c9 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"
More information about the Bf-blender-cvs
mailing list