Index: ps/trunk/binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml @@ -8,5 +8,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_glow.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_glow.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_glow.xml @@ -8,5 +8,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_glow_norm.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_glow_norm.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_glow_norm.xml @@ -9,5 +9,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_glow_wind.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_glow_wind.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_glow_wind.xml @@ -7,7 +7,7 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_specmap.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_specmap.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_specmap.xml @@ -3,5 +3,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao.xml @@ -7,5 +7,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml @@ -10,5 +10,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml @@ -7,5 +7,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_trans_norm_spec.xml @@ -8,5 +8,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml @@ -9,5 +9,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_trans_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_trans_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_trans_spec.xml @@ -7,5 +7,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/basic_trans_wind_norm_spec.xml @@ -10,5 +10,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao.xml +++ ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao.xml @@ -4,5 +4,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao_parallax_spec.xml @@ -7,5 +7,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/no_trans_ao_spec.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/no_trans_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/no_trans_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/no_trans_norm_spec.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml +++ ps/trunk/binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml @@ -6,5 +6,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/no_trans_parallax_spec.xml @@ -6,5 +6,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/no_trans_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/no_trans_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/no_trans_spec.xml @@ -4,5 +4,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/objectcolor_specmap.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/objectcolor_specmap.xml +++ ps/trunk/binaries/data/mods/public/art/materials/objectcolor_specmap.xml @@ -4,5 +4,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml @@ -7,5 +7,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml @@ -8,5 +8,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_ao_spec.xml @@ -7,5 +7,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_norm_spec.xml @@ -6,5 +6,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml @@ -7,5 +7,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml @@ -6,5 +6,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_spec.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml +++ ps/trunk/binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/rock_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/rock_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/rock_norm_spec.xml @@ -8,5 +8,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml +++ ps/trunk/binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml @@ -8,5 +8,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml @@ -4,5 +4,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_grass_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_grass_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_grass_spec.xml @@ -3,5 +3,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_norm.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_norm.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_norm.xml @@ -4,5 +4,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_norm_spec.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_norm_strong_spec.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_spec.xml @@ -4,5 +4,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar.xml @@ -4,5 +4,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml @@ -5,5 +5,5 @@ - + Index: ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml =================================================================== --- ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml +++ ps/trunk/binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml @@ -6,5 +6,5 @@ - + Index: ps/trunk/binaries/data/mods/public/shaders/glsl/model_common.fs =================================================================== --- ps/trunk/binaries/data/mods/public/shaders/glsl/model_common.fs +++ ps/trunk/binaries/data/mods/public/shaders/glsl/model_common.fs @@ -156,7 +156,6 @@ #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