[Bf-blender-cvs] [761e8ef] viewport_experiments: Tidy up the UI a bit for DOF

[Antony Riakiotakis]

Commit: 761e8ef73339e3c98abc858c0872574662fc786d
Author: Antony Riakiotakis
Date:   Thu Feb 12 18:36:32 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rB761e8ef73339e3c98abc858c0872574662fc786d

Tidy up the UI a bit for DOF

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

M	release/scripts/startup/bl_ui/properties_data_camera.py
M	release/scripts/startup/bl_ui/space_view3d.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 8a2805e..7fc2c2e 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -177,6 +177,7 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
         layout = self.layout
 
         cam = context.camera
+        dof_options = cam.gpu_dof
 
         layout.label(text="Focus:")
 
@@ -187,28 +188,7 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
 
         col.active = cam.dof_object is None
         col.prop(cam, "dof_distance", text="Distance")
-
-
-class DATA_PT_camera_gpu_dof(Panel):
-    bl_label = "GPU Depth of Field"
-    bl_space_type = 'PROPERTIES'
-    bl_region_type = 'WINDOW'
-    bl_context = "data"
-
-    def draw(self, context):
-        layout = self.layout
-
-        cam = context.camera
-
-        dof_options = cam.gpu_dof
-        col = layout.column(align=True)
-        col.label("Focus object or distance is set in Depth Of Field Panel")
-        col.label("Focal length and sensor also influence the effect")
-        col.prop(dof_options, "fstop")
-
-    @classmethod
-    def poll(cls, context):
-        return context.camera
+        col.prop(dof_options, "fstop", text="GPU fstop")
 
 
 class DATA_PT_camera_display(CameraButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 82d285b..c7b282b 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2936,10 +2936,11 @@ class VIEW3D_PT_view3d_shading(Panel):
 
             fx_settings = view.fx_settings
 
-            col.prop(fx_settings, "use_dof")
-            if fx_settings.use_dof:
-                if view.region_3d.view_perspective == 'CAMERA':
-                    col.label("check dof properties in camera settings", icon='INFO')
+            sub = col.column()
+            sub.active = view.region_3d.view_perspective == 'CAMERA'
+            sub.prop(fx_settings, "use_dof")
+            if fx_settings.use_dof and sub.active:
+                sub.label("check dof properties in camera settings", icon='INFO')
 
             col.prop(fx_settings, "use_ssao")
             if fx_settings.use_ssao: