Fix compilation error when Vertex Lighting is on

Flafla2 · Oct 10, 2019 · f2795e3 · f2795e3
1 parent 558bead
commit f2795e3
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 104 deletions.
diff --git a/Assets/Scene.unity b/Assets/Scene.unity
@@ -96,8 +96,7 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaAO: 1
     m_ExportTrainingData: 0
     m_TrainingDataDestination: TrainingData
-  m_LightingDataAsset: {fileID: 112000000, guid: 186267080dddf4607b7d526cccf2d517,
-    type: 2}
+  m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:

diff --git a/Assets/Scene/LightingData.asset b/Assets/Scene/LightingData.asset
diff --git a/Assets/Scene/LightingData.asset.meta b/Assets/Scene/LightingData.asset.meta
diff --git a/Assets/Scene/ReflectionProbe-0.exr b/Assets/Scene/ReflectionProbe-0.exr
diff --git a/Assets/Scene/ReflectionProbe-0.exr.meta b/Assets/Scene/ReflectionProbe-0.exr.meta
diff --git a/Assets/Toon Standard Material.mat b/Assets/Toon Standard Material.mat
@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Toon Test
+  m_Name: Toon Standard Material
   m_Shader: {fileID: 4800000, guid: afd4e5df5a9cf4406a8e772d4ea69d78, type: 3}
   m_ShaderKeywords: DAB_COORDS_TRIPLANAR
   m_LightmapFlags: 4
@@ -72,7 +72,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - _BumpScale: 0.73
+    - _BumpScale: 0.91
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0

diff --git a/Assets/Toon Standard Shader/ToonLighting.cginc b/Assets/Toon Standard Shader/ToonLighting.cginc
@@ -248,7 +248,7 @@ void ComputeVertexLightColor (v2f i) {
             unity_4LightPosX0, unity_4LightPosY0, unity_4LightPosZ0,
             unity_LightColor[0].rgb, unity_LightColor[1].rgb,
             unity_LightColor[2].rgb, unity_LightColor[3].rgb,
-            unity_4LightAtten0, i.worldPos, i.worldNormal
+            unity_4LightAtten0, i.worldPos, i.normal
         );
     #endif
 }