fixed sun flare when swtiching to pbs sky, cleaned up global volume

pierre-unity · pierre-unity · commit 9c17d3d9d623 · 2020-10-23T17:16:53.000+01:00
diff --git a/com.unity.template-hd/Assets/Animations/CinematicsTimeline.playable b/com.unity.template-hd/Assets/Animations/CinematicsTimeline.playable
@@ -2182,7 +2182,25 @@ MonoBehaviour:
       m_RotationOrder: 4
     m_MixOutCurve:
       serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -2209,7 +2227,25 @@ MonoBehaviour:
     m_BlendOutDuration: -1
     m_MixInCurve:
       serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Aluminium_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Aluminium_Mat.mat
@@ -277,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_A.mat b/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_A.mat
@@ -281,4 +281,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_Leaf_A.mat b/com.unity.template-hd/Assets/Art/Materials/General/Bamboo_Leaf_A.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Brass_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Brass_Mat.mat
@@ -278,4 +278,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Bush_01_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Bush_01_Mat.mat
@@ -548,4 +548,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Collision_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Collision_Mat.mat
@@ -264,4 +264,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteCyan_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteCyan_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteHoles_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteHoles_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteMatteGrey_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteMatteGrey_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcretePolished_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcretePolished_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 0.99999994
     - _AORemapMin: 0
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteRough_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteRough_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteSmooth_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteSmooth_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -122,6 +122,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ConcreteTaupe_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ConcreteTaupe_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/DecalPuddle_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/DecalPuddle_Mat.mat
@@ -284,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Decal_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Decal_Mat.mat
@@ -283,4 +283,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Drain_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Drain_Mat.mat
@@ -284,4 +284,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/EmissiveBulb_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/EmissiveBulb_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/EmissiveStripLight_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/EmissiveStripLight_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Fabric_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Fabric_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Fern_01_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Fern_01_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/GlassDark_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/GlassDark_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/GlassDirt_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/GlassDirt_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Ground_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Ground_Mat.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/MarbleFlooring_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/MarbleFlooring_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/MetalBlack_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/MetalBlack_Mat.mat
@@ -277,4 +277,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Plant_C.mat b/com.unity.template-hd/Assets/Art/Materials/General/Plant_C.mat
@@ -604,4 +604,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Rock_A.mat b/com.unity.template-hd/Assets/Art/Materials/General/Rock_A.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/Rubber_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/Rubber_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/SandblastMetal_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/SandblastMetal_Mat.mat
@@ -110,6 +110,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - _AORemapMax: 1
     - _AORemapMin: 0
@@ -277,4 +289,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/ShadowProxy_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/ShadowProxy_Mat.mat
@@ -267,4 +267,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/WoodCounter_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/WoodCounter_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Art/Materials/General/WoodLight_Mat.mat b/com.unity.template-hd/Assets/Art/Materials/General/WoodLight_Mat.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
diff --git a/com.unity.template-hd/Assets/Scenes/SampleScene.unity b/com.unity.template-hd/Assets/Scenes/SampleScene.unity
diff --git a/com.unity.template-hd/Assets/Settings/Volumes/Volume Global.asset b/com.unity.template-hd/Assets/Settings/Volumes/Volume Global.asset
diff --git a/com.unity.template-hd/Assets/Settings/Volumes/Volume Room 3.asset b/com.unity.template-hd/Assets/Settings/Volumes/Volume Room 3.asset
