[Bf-blender-cvs] [7fe1ecf89da] blender2.8: UI: Move Color Management panel from Scene to Render properties.

[Pablo Vazquez]

Commit: 7fe1ecf89dae2df2b0474df44defb806b4fa00c3
Author: Pablo Vazquez
Date:   Wed Oct 31 13:06:44 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB7fe1ecf89dae2df2b0474df44defb806b4fa00c3

UI: Move Color Management panel from Scene to Render properties.

It makes more sense to have Color Management under Render properties,
even though they are per scene (so are render dimensions anyway).

===================================================================

M	release/scripts/startup/bl_ui/properties_render.py
M	release/scripts/startup/bl_ui/properties_scene.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index d64570b07ca..951324cfbfd 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -511,6 +511,62 @@ class RENDER_PT_stereoscopy(RenderButtonsPanel, Panel):
             row.prop(rv, "camera_suffix", text="")
 
 
+class RENDER_PT_color_management(RenderButtonsPanel, Panel):
+    bl_label = "Color Management"
+    bl_options = {'DEFAULT_CLOSED'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'}
+
+    def draw(self, context):
+        layout = self.layout
+        layout.use_property_split = True
+
+        scene = context.scene
+        view = scene.view_settings
+
+        flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True)
+
+        col = flow.column()
+        col.prop(scene.display_settings, "display_device")
+
+        col.separator()
+
+        col.prop(view, "view_transform")
+        col.prop(view, "look")
+
+        col = flow.column()
+        col.prop(view, "exposure")
+        col.prop(view, "gamma")
+
+        col.separator()
+
+        col.prop(scene.sequencer_colorspace_settings, "name", text="Sequencer")
+
+
+class RENDER_PT_color_management_curves(RenderButtonsPanel, Panel):
+    bl_label = "Use Curves"
+    bl_parent_id = "RENDER_PT_color_management"
+    bl_options = {'DEFAULT_CLOSED'}
+    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'}
+
+    def draw_header(self, context):
+
+        scene = context.scene
+        view = scene.view_settings
+
+        self.layout.prop(view, "use_curve_mapping", text="")
+
+    def draw(self, context):
+        layout = self.layout
+
+        scene = context.scene
+        view = scene.view_settings
+
+        layout.use_property_split = False
+        layout.enabled = view.use_curve_mapping
+
+        layout.template_curve_mapping(view, "curve_mapping", levels=True)
+
+
 class RENDER_PT_eevee_ambient_occlusion(RenderButtonsPanel, Panel):
     bl_label = "Ambient Occlusion"
     bl_options = {'DEFAULT_CLOSED'}
@@ -943,6 +999,8 @@ classes = (
     RENDER_PT_stamp_burn,
     RENDER_UL_renderviews,
     RENDER_PT_stereoscopy,
+    RENDER_PT_color_management,
+    RENDER_PT_color_management_curves,
     RENDER_PT_eevee_hair,
     RENDER_PT_eevee_sampling,
     RENDER_PT_eevee_film,
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index 47f6c7662b1..6daa96bc1d6 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -290,62 +290,6 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, SceneKeyingSetsPanel, Panel):
                 col.prop(ksp, "group")
 
 
-class SCENE_PT_color_management(SceneButtonsPanel, Panel):
-    bl_label = "Color Management"
-    bl_options = {'DEFAULT_CLOSED'}
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'}
-
-    def draw(self, context):
-        layout = self.layout
-        layout.use_property_split = True
-
-        scene = context.scene
-        view = scene.view_settings
-
-        flow = layout.grid_flow(row_major=True, columns=0, even_columns=False, even_rows=False, align=True)
-
-        col = flow.column()
-        col.prop(scene.display_settings, "display_device")
-
-        col.separator()
-
-        col.prop(view, "view_transform")
-        col.prop(view, "look")
-
-        col = flow.column()
-        col.prop(view, "exposure")
-        col.prop(view, "gamma")
-
-        col.separator()
-
-        col.prop(scene.sequencer_colorspace_settings, "name", text="Sequencer")
-
-
-class SCENE_PT_color_management_curves(SceneButtonsPanel, Panel):
-    bl_label = "Use Curves"
-    bl_parent_id = "SCENE_PT_color_management"
-    bl_options = {'DEFAULT_CLOSED'}
-    COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_OPENGL'}
-
-    def draw_header(self, context):
-
-        scene = context.scene
-        view = scene.view_settings
-
-        self.layout.prop(view, "use_curve_mapping", text="")
-
-    def draw(self, context):
-        layout = self.layout
-
-        scene = context.scene
-        view = scene.view_settings
-
-        layout.use_property_split = False
-        layout.enabled = view.use_curve_mapping
-
-        layout.template_curve_mapping(view, "curve_mapping", levels=True)
-
-
 class SCENE_PT_audio(SceneButtonsPanel, Panel):
     bl_label = "Audio"
     bl_options = {'DEFAULT_CLOSED'}
@@ -607,8 +551,6 @@ classes = (
     SCENE_PT_keying_sets,
     SCENE_PT_keying_set_paths,
     SCENE_PT_keyframing_settings,
-    SCENE_PT_color_management,
-    SCENE_PT_color_management_curves,
     SCENE_PT_audio,
     SCENE_PT_physics,
     SCENE_PT_rigid_body_world,