diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-27 16:44:52 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-27 16:44:52 +0400 |
commit | e116d3a7be30c23707279a40089fb7483fe438e1 (patch) | |
tree | 27f54a908b6238bb26c742045c33b64c0980f38e /release/scripts/startup/bl_ui | |
parent | d4e40b52309b69b2a4379db6df5a6ace9fad65e8 (diff) |
Color Management: move "Color Unpremultiply" option to Color Management panel
from the Shading panel, since it's about color space conversion for renders.
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 2 |
2 files changed, 2 insertions, 1 deletions
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() |