[Bf-blender-cvs] [b063115d4e4] tmp-eevee-shadowmap-refactor: EEVEE: Remove softness parameters from RNA & UI

[Clément Foucault]

Commit: b063115d4e44d8491ef2396d6b24691c3297a42d
Author: Clément Foucault
Date:   Mon Sep 2 16:27:09 2019 +0200
Branches: tmp-eevee-shadowmap-refactor
https://developer.blender.org/rBb063115d4e44d8491ef2396d6b24691c3297a42d

EEVEE: Remove softness parameters from RNA & UI

Keep it in DNA for backward compatibility

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

M	release/scripts/startup/bl_ui/properties_data_light.py
M	source/blender/makesdna/DNA_light_types.h
M	source/blender/makesrna/intern/rna_light.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_light.py b/release/scripts/startup/bl_ui/properties_data_light.py
index 0085b6ff515..6f730cf3307 100644
--- a/release/scripts/startup/bl_ui/properties_data_light.py
+++ b/release/scripts/startup/bl_ui/properties_data_light.py
@@ -178,7 +178,6 @@ class DATA_PT_EEVEE_shadow(DataButtonsPanel, Panel):
         if light.type != 'SUN':
             sub.prop(light, "shadow_buffer_clip_start", text="Clip Start")
 
-        col.prop(light, "shadow_buffer_soft", text="Softness")
         col.prop(light, "shadow_buffer_bias", text="Bias")
 
 
@@ -239,7 +238,6 @@ class DATA_PT_EEVEE_shadow_contact(DataButtonsPanel, Panel):
         col.active = light.use_shadow and light.use_contact_shadow
 
         col.prop(light, "contact_shadow_distance", text="Distance")
-        col.prop(light, "contact_shadow_soft_size", text="Softness")
         col.prop(light, "contact_shadow_bias", text="Bias")
         col.prop(light, "contact_shadow_thickness", text="Thickness")
 
diff --git a/source/blender/makesdna/DNA_light_types.h b/source/blender/makesdna/DNA_light_types.h
index 23abd8dbb34..510d41dadea 100644
--- a/source/blender/makesdna/DNA_light_types.h
+++ b/source/blender/makesdna/DNA_light_types.h
@@ -58,7 +58,8 @@ typedef struct Light {
   char _pad2[2];
 
   float clipsta, clipend;
-  float bias, soft;
+  float bias;
+  float soft DNA_DEPRECATED;
   float bleedbias DNA_DEPRECATED;
   float bleedexp DNA_DEPRECATED;
   short bufsize, samp, buffers, filtertype;
@@ -84,7 +85,10 @@ typedef struct Light {
   float cascade_fade;
   int cascade_count;
 
-  float contact_dist, contact_bias, contact_spread, contact_thickness;
+  float contact_dist;
+  float contact_bias;
+  float contact_spread DNA_DEPRECATED;
+  float contact_thickness;
 
   float spec_fac, att_dist;
 
diff --git a/source/blender/makesrna/intern/rna_light.c b/source/blender/makesrna/intern/rna_light.c
index d1231e6b266..7357bd870fb 100644
--- a/source/blender/makesrna/intern/rna_light.c
+++ b/source/blender/makesrna/intern/rna_light.c
@@ -305,13 +305,6 @@ static void rna_def_light_shadow(StructRNA *srna, bool sun)
   RNA_def_property_ui_text(prop, "Shadow Buffer Bias", "Bias for reducing self shadowing");
   RNA_def_property_update(prop, 0, "rna_Light_update");
 
-  prop = RNA_def_property(srna, "shadow_buffer_soft", PROP_FLOAT, PROP_NONE);
-  RNA_def_property_float_sdna(prop, NULL, "soft");
-  RNA_def_property_float_default(prop, 3.0f);
-  RNA_def_property_range(prop, 0.0f, 100.0f);
-  RNA_def_property_ui_text(prop, "Shadow Buffer Soft", "Size of shadow buffer sampling area");
-  RNA_def_property_update(prop, 0, "rna_Light_update");
-
   prop = RNA_def_property(srna, "shadow_buffer_samples", PROP_INT, PROP_NONE);
   RNA_def_property_int_sdna(prop, NULL, "samp");
   RNA_def_property_range(prop, 1, 16);
@@ -361,14 +354,6 @@ static void rna_def_light_shadow(StructRNA *srna, bool sun)
   RNA_def_property_ui_text(prop, "Contact Shadow Bias", "Bias to avoid self shadowing");
   RNA_def_property_update(prop, 0, "rna_Light_update");
 
-  prop = RNA_def_property(srna, "contact_shadow_soft_size", PROP_FLOAT, PROP_NONE);
-  RNA_def_property_float_sdna(prop, NULL, "contact_spread");
-  RNA_def_property_float_default(prop, 0.2f);
-  RNA_def_property_range(prop, 0.0f, 9999.0f);
-  RNA_def_property_ui_text(
-      prop, "Contact Shadow Soft", "Control how soft the contact shadows will be");
-  RNA_def_property_update(prop, 0, "rna_Light_update");
-
   prop = RNA_def_property(srna, "contact_shadow_thickness", PROP_FLOAT, PROP_DISTANCE);
   RNA_def_property_float_sdna(prop, NULL, "contact_thickness");
   RNA_def_property_float_default(prop, 0.2f);