diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-12 21:59:34 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-12 21:59:34 +0300 |
commit | 8de421bbf1c2ec9ac8156337d4df35d3d8019180 (patch) | |
tree | ce2d9b1f5374035b94cc71aedce232657e4e9a22 | |
parent | d0a91eb1b400607e0b4cb912b2a3020870ebdae3 (diff) |
Use the RNA for overriding the name instead.
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_camera.py | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index af0cbc71de7..63518d7fdb6 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 d3b0f5505fa..40cda362bf1 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 b3151d5a844..80977fa3219 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); |