Merge pull request #2 from MattOstgard/master

Updated Built-in Shaders to 2019.4.1
TwoTailsGames · Jul 4, 2020 · 6a63f93 · 6a63f93
2 parents 632e3e7 + 183e242
commit 6a63f93
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 75 deletions.
diff --git a/CGIncludes/SpeedTreeWind.cginc b/CGIncludes/SpeedTreeWind.cginc
@@ -261,7 +261,7 @@ float3 GlobalWind(float3 vPos, float3 vInstancePos, bool bPreserveShape, float3
         float fAdjust = max(vPos.y - (1.0 / _ST_WindGlobal.z) * 0.25, 0.0) * _ST_WindGlobal.z;
     #endif
     if (fAdjust != 0.0)
-        fAdjust = pow(fAdjust, _ST_WindGlobal.w);
+        fAdjust = pow(abs(fAdjust), _ST_WindGlobal.w);
 
     // primary oscillation
     float4 vOscillations = TrigApproximate(float4(vInstancePos.x + time, vInstancePos.y + time * 0.8, 0.0, 0.0));

diff --git a/DefaultResourcesExtra/Particle Standard Surface.shader b/DefaultResourcesExtra/Particle Standard Surface.shader
@@ -140,6 +140,7 @@ Shader "Particles/Standard Surface"
         CGPROGRAM
         #pragma surface surf Standard nolightmap nometa noforwardadd keepalpha vertex:vert
         #pragma multi_compile __ SOFTPARTICLES_ON
+        #pragma multi_compile __ SHADOWS_SHADOWMASK
         #pragma multi_compile_instancing
         #pragma instancing_options procedural:vertInstancingSetup
         #pragma target 3.0

diff --git a/DefaultResourcesExtra/VR/Shaders/ClippingMask.shader b/DefaultResourcesExtra/VR/Shaders/ClippingMask.shader
diff --git a/DefaultResourcesExtra/VR/Shaders/VideoBackground.shader b/DefaultResourcesExtra/VR/Shaders/VideoBackground.shader
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Unity Built in Shaders
 
-Current repository version: 2019.3.10
+Current repository version: 2019.4.1
 
 An unofficial repo for Unity Built-in Shaders.