[Bf-blender-cvs] [c37c50e] viewport_experiments: Add quality settings for depth of field - still inactive.

[Antony Riakiotakis]

Commit: c37c50e33ff9822436b4047b690f5903113d79da
Author: Antony Riakiotakis
Date:   Sat Dec 6 00:32:04 2014 +0100
Branches: viewport_experiments
https://developer.blender.org/rBc37c50e33ff9822436b4047b690f5903113d79da

Add quality settings for depth of field - still inactive.

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 395492c..c864f84 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -190,6 +190,7 @@ class DATA_PT_camera_gpu_dof(Panel):
         col.prop(dof_options, "dof_fstop")
         col.prop(dof_options, "dof_focal_length")
         col.prop(dof_options, "dof_sensor")
+        col.prop(dof_options, "dof_quality_mode")
 
     @classmethod
     def poll(cls, context):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 53233c1..23baf78 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2927,6 +2927,7 @@ class VIEW3D_PT_view3d_shading(Panel):
                     subcol.prop(dof_options, "dof_fstop")
                     subcol.prop(dof_options, "dof_focal_length")
                     subcol.prop(dof_options, "dof_sensor")
+                    subcol.prop(dof_options, "dof_quality_mode")
             col.prop(view, "ssao")
             if view.ssao:
                 ssao_options = fxoptions.ssao_options
diff --git a/source/blender/makesdna/DNA_gpu_types.h b/source/blender/makesdna/DNA_gpu_types.h
index 8d68c85..1f63c99 100644
--- a/source/blender/makesdna/DNA_gpu_types.h
+++ b/source/blender/makesdna/DNA_gpu_types.h
@@ -38,6 +38,8 @@ typedef struct GPUDOFOptions {
 	float dof_fstop;
 	float dof_focal_length;
 	float dof_sensor;
+	int dof_quality_mode;
+	int pad;
 } GPUDOFOptions;
 
 /* properties for SSAO effect */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 46af557..4e4e2a1 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3826,6 +3826,12 @@ static void rna_def_gpu_dof_fx(BlenderRNA *brna)
 	StructRNA *srna;
 	PropertyRNA *prop;
 
+	static EnumPropertyItem dof_quality_items[] = {
+	    {0, "NORMAL", 0, "Normal", "Use standard blurring depth of field"},
+	    {1, "HIGH", 0, "High", "Use diffusion solver depth of field"},
+	    {0, NULL, 0, NULL, NULL}
+	};
+
 	srna = RNA_def_struct(brna, "GPUDOFOptions", NULL);
 	RNA_def_struct_ui_text(srna, "GPU DOF", "Options for GPU based depth of field");
 	RNA_def_struct_ui_icon(srna, ICON_RENDERLAYERS);
@@ -3854,6 +3860,11 @@ static void rna_def_gpu_dof_fx(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.1f, 64.0f, 10, 1);
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+
+	prop = RNA_def_property(srna, "dof_quality_mode", PROP_ENUM, PROP_NONE);
+	RNA_def_property_ui_text(prop, "Quality", "Quality of the dof effect");
+	RNA_def_property_enum_items(prop, dof_quality_items);
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 }
 
 static void rna_def_gpu_ssao_fx(BlenderRNA *brna)
@@ -3890,7 +3901,7 @@ static void rna_def_gpu_ssao_fx(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
 	prop = RNA_def_property(srna, "ssao_ray_sample_mode", PROP_ENUM, PROP_NONE);
-	RNA_def_property_ui_text(prop, "Sample mode", "Attenuation constant");
+	RNA_def_property_ui_text(prop, "Sample mode", "Quality of the SSAO algorithm");
 	RNA_def_property_enum_items(prop, view3d_ssao_sample_items);
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);