[Bf-blender-cvs] [d0a91eb] master: More naming refinement GPU fstop -> Viewport f-stop

[Antony Riakiotakis]

Commit: d0a91eb1b400607e0b4cb912b2a3020870ebdae3
Author: Antony Riakiotakis
Date:   Thu Feb 12 19:50:19 2015 +0100
Branches: master
https://developer.blender.org/rBd0a91eb1b400607e0b4cb912b2a3020870ebdae3

More naming refinement GPU fstop -> Viewport f-stop

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

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 df773c2..af0cbc7 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -456,7 +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.prop(dof_options, "fstop", text="Viewport f-stop")
 
         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 c605b0f..d3b0f55 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -189,7 +189,7 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel):
         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")
+        col.prop(dof_options, "fstop", text="Viewport f-stop")
 
 
 class DATA_PT_camera_display(CameraButtonsPanel, Panel):