From fdf3aaf621c7f93164f37739d494a4e742d28db7 Mon Sep 17 00:00:00 2001
From: vladislavbelov <vladislavbelov@3db68df2-c116-0410-a063-a993310a9797>
Date: Wed, 8 Dec 2021 18:28:42 +0000
Subject: [PATCH] Removes AO multiplier as a duplicate way to adjust AO, makes
 it closer to PBR.

Differential Revision: https://code.wildfiregames.com/D4361

git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@26038 3db68df2-c116-0410-a063-a993310a9797
---
 binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml  | 2 +-
 binaries/data/mods/public/art/materials/basic_glow.xml                  | 2 +-
 binaries/data/mods/public/art/materials/basic_glow_norm.xml             | 2 +-
 binaries/data/mods/public/art/materials/basic_glow_wind.xml             | 2 +-
 binaries/data/mods/public/art/materials/basic_specmap.xml               | 2 +-
 binaries/data/mods/public/art/materials/basic_trans_ao.xml              | 2 +-
 .../data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml     | 2 +-
 binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml         | 2 +-
 binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml       | 2 +-
 binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml   | 2 +-
 binaries/data/mods/public/art/materials/basic_trans_spec.xml            | 2 +-
 binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml  | 2 +-
 binaries/data/mods/public/art/materials/no_trans_ao.xml                 | 2 +-
 binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml   | 2 +-
 binaries/data/mods/public/art/materials/no_trans_ao_spec.xml            | 2 +-
 binaries/data/mods/public/art/materials/no_trans_norm_spec.xml          | 2 +-
 binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml        | 2 +-
 binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml      | 2 +-
 binaries/data/mods/public/art/materials/no_trans_spec.xml               | 2 +-
 binaries/data/mods/public/art/materials/objectcolor_specmap.xml         | 2 +-
 binaries/data/mods/public/art/materials/player_trans_ao.xml             | 2 +-
 binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml    | 2 +-
 .../data/mods/public/art/materials/player_trans_ao_parallax_spec.xml    | 2 +-
 binaries/data/mods/public/art/materials/player_trans_ao_spec.xml        | 2 +-
 binaries/data/mods/public/art/materials/player_trans_norm_spec.xml      | 2 +-
 binaries/data/mods/public/art/materials/player_trans_parallax.xml       | 2 +-
 binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml  | 2 +-
 .../mods/public/art/materials/player_trans_parallax_spec_helmet.xml     | 2 +-
 binaries/data/mods/public/art/materials/player_trans_spec.xml           | 2 +-
 binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml    | 2 +-
 binaries/data/mods/public/art/materials/rock_norm_spec.xml              | 2 +-
 binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml           | 2 +-
 binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml     | 2 +-
 binaries/data/mods/public/art/materials/terrain_grass_spec.xml          | 2 +-
 binaries/data/mods/public/art/materials/terrain_norm.xml                | 2 +-
 binaries/data/mods/public/art/materials/terrain_norm_spec.xml           | 2 +-
 binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml    | 2 +-
 binaries/data/mods/public/art/materials/terrain_spec.xml                | 2 +-
 binaries/data/mods/public/art/materials/terrain_triplanar.xml           | 2 +-
 binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml      | 2 +-
 binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml | 2 +-
 binaries/data/mods/public/shaders/glsl/model_common.fs                  | 1 -
 42 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml b/binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml
index 0a105627ac..d57a4d23e9 100644
--- a/binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml
+++ b/binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml
@@ -8,5 +8,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_glow.xml b/binaries/data/mods/public/art/materials/basic_glow.xml
index c058fda1a1..447f9f4ed6 100644
--- a/binaries/data/mods/public/art/materials/basic_glow.xml
+++ b/binaries/data/mods/public/art/materials/basic_glow.xml
@@ -8,5 +8,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_glow_norm.xml b/binaries/data/mods/public/art/materials/basic_glow_norm.xml
index 67d1d88773..5acbc04f41 100644
--- a/binaries/data/mods/public/art/materials/basic_glow_norm.xml
+++ b/binaries/data/mods/public/art/materials/basic_glow_norm.xml
@@ -9,5 +9,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_glow_wind.xml b/binaries/data/mods/public/art/materials/basic_glow_wind.xml
index 9174c85a17..82374ce306 100644
--- a/binaries/data/mods/public/art/materials/basic_glow_wind.xml
+++ b/binaries/data/mods/public/art/materials/basic_glow_wind.xml
@@ -7,7 +7,7 @@
   <define name="USE_SPECULAR_MAP" value="1"/>
   <define name="USE_SELF_LIGHT" value="1"/>
   <define name="USE_WIND" value="1"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
   <renderquery name="sim_time"/>
   <required_texture name="baseTex"/>
   <shader effect="model_transparent"/>
diff --git a/binaries/data/mods/public/art/materials/basic_specmap.xml b/binaries/data/mods/public/art/materials/basic_specmap.xml
index 952571b70d..e291a4ac12 100644
--- a/binaries/data/mods/public/art/materials/basic_specmap.xml
+++ b/binaries/data/mods/public/art/materials/basic_specmap.xml
@@ -3,5 +3,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 25.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 25.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_trans_ao.xml b/binaries/data/mods/public/art/materials/basic_trans_ao.xml
index cc1039f4f3..ffc507f591 100644
--- a/binaries/data/mods/public/art/materials/basic_trans_ao.xml
+++ b/binaries/data/mods/public/art/materials/basic_trans_ao.xml
@@ -7,5 +7,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml b/binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml
index d006fa22ae..867e5c30a2 100644
--- a/binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml
+++ b/binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml
@@ -10,5 +10,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml b/binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml
index b93fe7839a..ab788de044 100644
--- a/binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml
+++ b/binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml
@@ -7,5 +7,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml b/binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml
index 5f3135a842..45c57fbf4a 100644
--- a/binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml
@@ -8,5 +8,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0 0"/>
+  <uniform name="effectSettings" value="1.0 50.0 0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml b/binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml
index be35afdbd7..fe1824a813 100644
--- a/binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml
+++ b/binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml
@@ -9,5 +9,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_trans_spec.xml b/binaries/data/mods/public/art/materials/basic_trans_spec.xml
index 0b47a5119b..242ec65523 100644
--- a/binaries/data/mods/public/art/materials/basic_trans_spec.xml
+++ b/binaries/data/mods/public/art/materials/basic_trans_spec.xml
@@ -7,5 +7,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model_transparent"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml b/binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml
index f8c8600cbd..dd4d34650b 100644
--- a/binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml
@@ -10,5 +10,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="model_transparent"/>
   <uniform name="windData" value="1.0 1.0"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.0"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/no_trans_ao.xml b/binaries/data/mods/public/art/materials/no_trans_ao.xml
index 01d01615d2..3b4306f110 100644
--- a/binaries/data/mods/public/art/materials/no_trans_ao.xml
+++ b/binaries/data/mods/public/art/materials/no_trans_ao.xml
@@ -4,5 +4,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml b/binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml
index 4c15af9cd5..3336aae19d 100644
--- a/binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml
+++ b/binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml
@@ -7,5 +7,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/no_trans_ao_spec.xml b/binaries/data/mods/public/art/materials/no_trans_ao_spec.xml
index d622995013..b10822a958 100644
--- a/binaries/data/mods/public/art/materials/no_trans_ao_spec.xml
+++ b/binaries/data/mods/public/art/materials/no_trans_ao_spec.xml
@@ -5,5 +5,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/no_trans_norm_spec.xml b/binaries/data/mods/public/art/materials/no_trans_norm_spec.xml
index fe5bc31751..ca31523975 100644
--- a/binaries/data/mods/public/art/materials/no_trans_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/no_trans_norm_spec.xml
@@ -5,5 +5,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1 50 0 0"/>
+  <uniform name="effectSettings" value="1 50 0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml b/binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml
index c9e198cd3f..082d79e9a6 100644
--- a/binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml
+++ b/binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml
@@ -6,5 +6,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml b/binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml
index 0f1d64cc54..d6b9dc69d9 100644
--- a/binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml
+++ b/binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml
@@ -6,5 +6,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/no_trans_spec.xml b/binaries/data/mods/public/art/materials/no_trans_spec.xml
index 71864dcbb0..33d3d27fdf 100644
--- a/binaries/data/mods/public/art/materials/no_trans_spec.xml
+++ b/binaries/data/mods/public/art/materials/no_trans_spec.xml
@@ -4,5 +4,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/objectcolor_specmap.xml b/binaries/data/mods/public/art/materials/objectcolor_specmap.xml
index 93a982d91a..80011667be 100644
--- a/binaries/data/mods/public/art/materials/objectcolor_specmap.xml
+++ b/binaries/data/mods/public/art/materials/objectcolor_specmap.xml
@@ -4,5 +4,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_ao.xml b/binaries/data/mods/public/art/materials/player_trans_ao.xml
index 680080e433..be62414a89 100644
--- a/binaries/data/mods/public/art/materials/player_trans_ao.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_ao.xml
@@ -5,5 +5,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml b/binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml
index ecae7ac0ef..eee40822f8 100644
--- a/binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml
@@ -7,5 +7,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml b/binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml
index dff55df9c5..8e8eb57a4a 100644
--- a/binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml
@@ -8,5 +8,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_ao_spec.xml b/binaries/data/mods/public/art/materials/player_trans_ao_spec.xml
index 0dbed5ab21..d262b3f0be 100644
--- a/binaries/data/mods/public/art/materials/player_trans_ao_spec.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_ao_spec.xml
@@ -7,5 +7,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_norm_spec.xml b/binaries/data/mods/public/art/materials/player_trans_norm_spec.xml
index b420c79a88..5584687b86 100644
--- a/binaries/data/mods/public/art/materials/player_trans_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_norm_spec.xml
@@ -6,5 +6,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1 50 0 0"/>
+  <uniform name="effectSettings" value="1 50 0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_parallax.xml b/binaries/data/mods/public/art/materials/player_trans_parallax.xml
index 788556bfe1..84438a95fc 100644
--- a/binaries/data/mods/public/art/materials/player_trans_parallax.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_parallax.xml
@@ -5,5 +5,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.75"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml b/binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml
index d3d2a7f8e2..520a7172a2 100644
--- a/binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml
@@ -7,5 +7,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml b/binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml
index fcbf28d7a7..c367482ee3 100644
--- a/binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml
@@ -6,5 +6,5 @@
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 10.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_spec.xml b/binaries/data/mods/public/art/materials/player_trans_spec.xml
index 147073ed77..eb113d9975 100644
--- a/binaries/data/mods/public/art/materials/player_trans_spec.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_spec.xml
@@ -5,5 +5,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml b/binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml
index faad01a479..420a16ff6a 100644
--- a/binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml
+++ b/binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml
@@ -5,5 +5,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 10.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/rock_norm_spec.xml b/binaries/data/mods/public/art/materials/rock_norm_spec.xml
index 834bbeb2e3..2f76904156 100644
--- a/binaries/data/mods/public/art/materials/rock_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/rock_norm_spec.xml
@@ -8,5 +8,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="5.0 50.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="5.0 50.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml b/binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml
index 3ede5a86dd..045febb6c2 100644
--- a/binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml
+++ b/binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml
@@ -8,5 +8,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="aoTex" define="USE_AO"/>
   <shader effect="model"/>
-  <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
+  <uniform name="effectSettings" value="1.0 10.0 0.0075"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml b/binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml
index c3a7e651c7..fcf9c476f2 100644
--- a/binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml
@@ -4,5 +4,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_grass"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_grass_spec.xml b/binaries/data/mods/public/art/materials/terrain_grass_spec.xml
index 98cbf521dd..df8552f4ca 100644
--- a/binaries/data/mods/public/art/materials/terrain_grass_spec.xml
+++ b/binaries/data/mods/public/art/materials/terrain_grass_spec.xml
@@ -3,5 +3,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_grass"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_norm.xml b/binaries/data/mods/public/art/materials/terrain_norm.xml
index 0942970586..726f6cd518 100644
--- a/binaries/data/mods/public/art/materials/terrain_norm.xml
+++ b/binaries/data/mods/public/art/materials/terrain_norm.xml
@@ -4,5 +4,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_norm_spec.xml b/binaries/data/mods/public/art/materials/terrain_norm_spec.xml
index b32cb6d204..a0dc41e5c0 100644
--- a/binaries/data/mods/public/art/materials/terrain_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/terrain_norm_spec.xml
@@ -5,5 +5,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml b/binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml
index 24a6eebf72..812b48f7da 100644
--- a/binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml
+++ b/binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml
@@ -5,5 +5,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="2.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="2.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_spec.xml b/binaries/data/mods/public/art/materials/terrain_spec.xml
index e6f5a22e4a..547a2af8fa 100644
--- a/binaries/data/mods/public/art/materials/terrain_spec.xml
+++ b/binaries/data/mods/public/art/materials/terrain_spec.xml
@@ -4,5 +4,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_triplanar.xml b/binaries/data/mods/public/art/materials/terrain_triplanar.xml
index e91389b659..4241a275c4 100644
--- a/binaries/data/mods/public/art/materials/terrain_triplanar.xml
+++ b/binaries/data/mods/public/art/materials/terrain_triplanar.xml
@@ -4,5 +4,5 @@
   <define name="USE_TRIPLANAR" value="1"/>
   <required_texture name="baseTex"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml b/binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml
index f95243de12..50ada513f1 100644
--- a/binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml
+++ b/binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml
@@ -5,5 +5,5 @@
   <required_texture name="baseTex"/>
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml b/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
index fd832d6d5f..bf660b66d4 100644
--- a/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
+++ b/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
@@ -6,5 +6,5 @@
   <required_texture name="normTex" define="USE_NORMAL_MAP"/>
   <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
   <shader effect="terrain_base"/>
-  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/shaders/glsl/model_common.fs b/binaries/data/mods/public/shaders/glsl/model_common.fs
index b83af0d8f5..6ae9ad9f1f 100644
--- a/binaries/data/mods/public/shaders/glsl/model_common.fs
+++ b/binaries/data/mods/public/shaders/glsl/model_common.fs
@@ -156,7 +156,6 @@ void main()
 
   #if (USE_INSTANCING || USE_GPU_SKINNING) && USE_AO
     float ao = texture2D(aoTex, v_tex2).r;
-    ao = mix(1.0, ao * 2.0, effectSettings.w);
   #else
     float ao = 1.0;
   #endif
-- 
2.11.4.GIT