[Bf-blender-cvs] [8de421b] master: Use the RNA for overriding the name instead.

[Antony Riakiotakis]

Commit: 8de421bbf1c2ec9ac8156337d4df35d3d8019180
Author: Antony Riakiotakis
Date:   Thu Feb 12 19:59:34 2015 +0100
Branches: master
https://developer.blender.org/rB8de421bbf1c2ec9ac8156337d4df35d3d8019180

Use the RNA for overriding the name instead.

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

M	intern/cycles/blender/addon/ui.py
M	release/scripts/startup/bl_ui/properties_data_camera.py
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index af0cbc7..63518d7 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="Viewport f-stop")
+        col.prop(dof_options, "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 d3b0f55..40cda36 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="Viewport f-stop")
+        col.prop(dof_options, "fstop")
 
 
 class DATA_PT_camera_display(CameraButtonsPanel, Panel):
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index b3151d5..80977fa 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3873,7 +3873,7 @@ static void rna_def_gpu_dof_fx(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
 	prop = RNA_def_property(srna, "fstop", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_ui_text(prop, "F/Stop", "FStop for dof effect");
+	RNA_def_property_ui_text(prop, "Viewport f-stop", "FStop for dof effect");
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.1f, 128.0f, 10, 1);
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);