[Bf-blender-cvs] [4322085] viewport_experiments: Only show properties if not in camera view, else direct user to camera properties

[Antony Riakiotakis]

Commit: 4322085f4f0a3dcd2ec5d48f8d47b36ebeeb164a
Author: Antony Riakiotakis
Date:   Tue Nov 4 15:24:25 2014 +0100
Branches: viewport_experiments
https://developer.blender.org/rB4322085f4f0a3dcd2ec5d48f8d47b36ebeeb164a

Only show properties if not in camera view, else direct user to camera
properties

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

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 357a3e1..6f0845b 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -194,6 +194,7 @@ class DATA_PT_camera_gpu_dof(Panel):
 
         dof_options = cam.gpu_dof
         col = layout.column(align=True)
+        col.label("Focus object or distance is set in Depth Of Field Panel")
         col.prop(dof_options, "dof_fstop")
         col.prop(dof_options, "dof_focal_length")
         col.prop(dof_options, "dof_sensor")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 88febb2..0e03b1e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2898,14 +2898,15 @@ class VIEW3D_PT_view3d_shading(Panel):
 
             col.prop(view, "depth_of_field")
             if view.depth_of_field:
-                dof_options = fxoptions.dof_options
-                subcol = col.column(align=True)
-                subcol.prop(dof_options, "dof_focus_distance")
-                #fstop is preferable?..
-                #subcol.prop(view, "dof_aperture")
-                subcol.prop(dof_options, "dof_fstop")
-                subcol.prop(dof_options, "dof_focal_length")
-                subcol.prop(dof_options, "dof_sensor")
+                if (view.region_3d.view_perspective == 'CAMERA'):
+                    col.label("check dof properties in camera settings", icon='INFO')
+                else:
+                    dof_options = fxoptions.dof_options
+                    subcol = col.column(align=True)
+                    subcol.prop(dof_options, "dof_focus_distance")
+                    subcol.prop(dof_options, "dof_fstop")
+                    subcol.prop(dof_options, "dof_focal_length")
+                    subcol.prop(dof_options, "dof_sensor")
             col.prop(view, "ssao")
             if view.ssao:
                 ssao_options = fxoptions.ssao_options