From e116d3a7be30c23707279a40089fb7483fe438e1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 27 Sep 2012 12:44:52 +0000 Subject: Color Management: move "Color Unpremultiply" option to Color Management panel from the Shading panel, since it's about color space conversion for renders. --- release/scripts/startup/bl_ui/properties_render.py | 1 - release/scripts/startup/bl_ui/properties_scene.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 9d400ae078d..74f4c719cd5 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -316,7 +316,6 @@ class RENDER_PT_shading(RenderButtonsPanel, Panel): col = split.column() col.prop(rd, "use_raytrace", text="Ray Tracing") - col.prop(rd, "use_color_unpremultiply") col.prop(rd, "alpha_mode", text="Alpha") diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 2ccdb9cee26..518b253d0b0 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -241,6 +241,7 @@ class SCENE_PT_color_management(Panel): layout = self.layout scene = context.scene + rd = scene.render col = layout.column() col.label(text="Display:") @@ -250,6 +251,7 @@ class SCENE_PT_color_management(Panel): col.separator() col.label(text="Render:") col.template_colormanaged_view_settings(scene, "view_settings") + col.prop(rd, "use_color_unpremultiply") col = layout.column() col.separator() -- cgit v1.2.3