Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
set as focused
This commit is contained in:
Antony Riakiotakis
2015-02-12 19:35:32 +01:00
parent ebd4a6e0dd
commit f20fa24ba1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/addon/ui.py
View File

@@ -445,6 +445,7 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel):
cam = context.camera cam = context.camera
ccam = cam.cycles ccam = cam.cycles
dof_options = cam.gpu_dof
split = layout.split() split = layout.split()
@@ -455,6 +456,7 @@ class CyclesCamera_PT_dof(CyclesButtonsPanel, Panel):
sub = col.row() sub = col.row()
sub.active = cam.dof_object is None sub.active = cam.dof_object is None
sub.prop(cam, "dof_distance", text="Distance") sub.prop(cam, "dof_distance", text="Distance")
col.prop(dof_options, "fstop", text="GPU fstop")
col = split.column() col = split.column()

5
release/scripts/startup/bl_ui/properties_data_camera.py
View File

@@ -186,8 +186,9 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
col = split.column() col = split.column()
col.active = cam.dof_object is None sub = col.column()
col.prop(cam, "dof_distance", text="Distance") sub.active = cam.dof_object is None
sub.prop(cam, "dof_distance", text="Distance")
col.prop(dof_options, "fstop", text="GPU fstop") col.prop(dof_options, "fstop", text="GPU fstop")