diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-22 18:37:28 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-22 18:37:31 +0300 |
commit | d9c5433144a0b5fb6beab263a98cc9262787b8be (patch) | |
tree | cb911343ee787305f3f9f5bfbaee431f8d6ccd9e | |
parent | 4cd9a3e3375e396dc0c09a492633be9ad4774b09 (diff) |
Eevee: Interface and units
We should use PROP_DISTANCE whenever appropriate.
Also rename "Data Draw Size" > "Size" in the UI for the lightprobes.
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_lightprobe.py | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py index f56ee24fdc0..cca5f823549 100644 --- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py +++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py @@ -156,8 +156,9 @@ class DATA_PT_lightprobe_display(DataButtonsPanel, Panel): row = layout.row() row.prop(probe, "show_data") + if probe.type != "PLANAR": - row.prop(probe, "data_draw_size") + row.prop(probe, "data_draw_size", text="Size") else: row.prop(ob, "empty_draw_size", text="Arrow Size") diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 17d85890a0b..4e3bc1c09b5 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -6181,7 +6181,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollectionEngineSettings_update"); - prop = RNA_def_property(srna, "gtao_distance", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "gtao_distance", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_gtao_distance_get", "rna_LayerEngineSettings_Eevee_gtao_distance_set", NULL); RNA_def_property_ui_text(prop, "Distance", "Distance of object that contribute to the ambient occlusion effect"); RNA_def_property_range(prop, 0.0f, 100000.0f); @@ -6208,7 +6208,7 @@ static void rna_def_scene_layer_engine_settings_eevee(BlenderRNA *brna) prop = RNA_def_property(srna, "bokeh_max_size", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Eevee_bokeh_max_size_get", "rna_LayerEngineSettings_Eevee_bokeh_max_size_set", NULL); - RNA_def_property_ui_text(prop, "Max Size", "Max size of the bokeh shape for the depth of field (lower values increase performance)"); + RNA_def_property_ui_text(prop, "Max Size", "Max size of the bokeh shape for the depth of field (lower is faster)"); RNA_def_property_range(prop, 0.0f, 2000.0f); RNA_def_property_ui_range(prop, 2.0f, 200.0f, 1, 3); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); |