[Bf-blender-cvs] [f20fa24] master: Add DOF fstop property for cycles, also don't grey it out when object is set as focused

[Antony Riakiotakis]

Commit: f20fa24ba18793799f6864d7223107012a5912c7
Author: Antony Riakiotakis
Date:   Thu Feb 12 19:35:32 2015 +0100
Branches: master
https://developer.blender.org/rBf20fa24ba18793799f6864d7223107012a5912c7

Add DOF fstop property for cycles, also don't grey it out when object is
set as focused

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

M	intern/cycles/blender/addon/ui.py
M	release/scripts/startup/bl_ui/properties_data_camera.py

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 651114a..df773c2 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -445,6 +445,7 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel):
 
         cam = context.camera
         ccam = cam.cycles
+        dof_options = cam.gpu_dof
 
         split = layout.split()
 
@@ -455,6 +456,7 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel):
         sub = col.row()
         sub.active = cam.dof_object is None
         sub.prop(cam, "dof_distance", text="Distance")
+        col.prop(dof_options, "fstop", text="GPU fstop")
 
         col = split.column()
 
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 7fc2c2e..c605b0f 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -186,8 +186,9 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
 
         col = split.column()
 
-        col.active = cam.dof_object is None
-        col.prop(cam, "dof_distance", text="Distance")
+        sub = col.column()
+        sub.active = cam.dof_object is None
+        sub.prop(cam, "dof_distance", text="Distance")
         col.prop(dof_options, "fstop", text="GPU fstop")