[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50923] trunk/blender/release/scripts/ startup/bl_ui: Color Management: move "Color Unpremultiply" option to Color Management panel

[Brecht Van Lommel]

Revision: 50923
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50923
Author:   blendix
Date:     2012-09-27 12:44:52 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
Color Management: move "Color Unpremultiply" option to Color Management panel
from the Shading panel, since it's about color space conversion for renders.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_render.py
    trunk/blender/release/scripts/startup/bl_ui/properties_scene.py

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2012-09-27 12:24:38 UTC (rev 50922)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render.py	2012-09-27 12:44:52 UTC (rev 50923)
@@ -316,7 +316,6 @@
 
         col = split.column()
         col.prop(rd, "use_raytrace", text="Ray Tracing")
-        col.prop(rd, "use_color_unpremultiply")
         col.prop(rd, "alpha_mode", text="Alpha")
 
 

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2012-09-27 12:24:38 UTC (rev 50922)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_scene.py	2012-09-27 12:44:52 UTC (rev 50923)
@@ -241,6 +241,7 @@
         layout = self.layout
 
         scene = context.scene
+        rd = scene.render
 
         col = layout.column()
         col.label(text="Display:")
@@ -250,6 +251,7 @@
         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()