[Bf-blender-cvs] [5515e57] viewport_experiments: Final nitpicks:

[Antony Riakiotakis]

Commit: 5515e5727b6838fd22ceb15f419a1b1d6a92e461
Author: Antony Riakiotakis
Date:   Thu Feb 12 18:45:27 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rB5515e5727b6838fd22ceb15f419a1b1d6a92e461

Final nitpicks:

No warning for out of camera, rename darken to factor/strength (since
color can be actually be light)

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/gpu/intern/gpu_compositing.c
M	source/blender/makesdna/DNA_gpu_types.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index c6a15e7..b5bd137 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2939,14 +2939,12 @@ class VIEW3D_PT_view3d_shading(Panel):
             sub = col.column()
             sub.active = view.region_3d.view_perspective == 'CAMERA'
             sub.prop(fx_settings, "use_dof")
-            if fx_settings.use_dof and sub.active:
-                sub.label("check dof properties in camera settings", icon='INFO')
 
             col.prop(fx_settings, "use_ssao", text="Ambient Occlusion")
             if fx_settings.use_ssao:
                 ssao_settings = fx_settings.ssao
                 subcol = col.column(align=True)
-                subcol.prop(ssao_settings, "darken")
+                subcol.prop(ssao_settings, "factor")
                 subcol.prop(ssao_settings, "distance_max")
                 subcol.prop(ssao_settings, "attenuation")
                 subcol.prop(ssao_settings, "samples")
diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c
index 5a8fd93..b423c14 100644
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@ -520,7 +520,7 @@ bool GPU_fx_do_composite_pass(GPUFX *fx, float projmat[4][4], bool is_persp, str
 			int color_uniform, depth_uniform;
 			int ssao_uniform, ssao_color_uniform, viewvecs_uniform, ssao_sample_params_uniform;
 			int ssao_jitter_uniform, ssao_concentric_tex;
-			float ssao_params[4] = {fx_ssao->distance_max, fx_ssao->darken, fx_ssao->attenuation, 0.0f};
+			float ssao_params[4] = {fx_ssao->distance_max, fx_ssao->factor, fx_ssao->attenuation, 0.0f};
 			float sample_params[4];
 
 			sample_params[0] = fx->ssao_sample_count * fx->ssao_sample_count;
@@ -856,7 +856,7 @@ void GPU_fx_compositor_init_dof_settings(GPUDOFSettings *fx_dof)
 
 void GPU_fx_compositor_init_ssao_settings(GPUSSAOSettings *fx_ssao)
 {
-	fx_ssao->darken = 1.0f;
+	fx_ssao->factor = 1.0f;
 	fx_ssao->distance_max = 0.2f;
 	fx_ssao->attenuation = 1.0f;
 	fx_ssao->samples = 4;
diff --git a/source/blender/makesdna/DNA_gpu_types.h b/source/blender/makesdna/DNA_gpu_types.h
index d6d5500..b6009b3 100644
--- a/source/blender/makesdna/DNA_gpu_types.h
+++ b/source/blender/makesdna/DNA_gpu_types.h
@@ -42,7 +42,7 @@ typedef struct GPUDOFSettings {
 
 /* properties for SSAO effect */
 typedef struct GPUSSAOSettings {
-	float darken;
+	float factor;
 	float color[3];
 	float distance_max;
 	float attenuation;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 70ded53..b3151d5 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3888,8 +3888,8 @@ static void rna_def_gpu_ssao_fx(BlenderRNA *brna)
 	RNA_def_struct_ui_text(srna, "GPU SSAO", "Settings for GPU based screen space ambient occlusion");
 	RNA_def_struct_ui_icon(srna, ICON_RENDERLAYERS);
 
-	prop = RNA_def_property(srna, "darken", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_ui_text(prop, "Darkening", "Darken the ssao effect");
+	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Strength", "Strength of the ssao effect");
 	RNA_def_property_range(prop, 0.0f, 250.0f);
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);