Skip to content

Commit fa12677

Browse files
authored
Merge branch 'Unity-Technologies:master' into master
2 parents 1f59946 + bb02a2f commit fa12677

File tree

963 files changed

+8555
-81768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

963 files changed

+8555
-81768
lines changed

TestProjects/HdrpDX12GraphicsTest-6000.0/Assets/RP_Assets/UtsDefaultVolumeProfile.asset

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ MonoBehaviour:
2929
m_Name: HDShadowSettings
3030
m_EditorClassIdentifier:
3131
active: 1
32+
interCascadeBorders: 1
3233
maxShadowDistance:
3334
m_OverrideState: 1
3435
m_Value: 500
@@ -74,9 +75,7 @@ MonoBehaviour:
7475
active: 1
7576
diffusionProfiles:
7677
m_OverrideState: 1
77-
m_Value:
78-
- {fileID: 11400000, guid: f35d1ac29f01482291c276feff307837, type: 2}
79-
- {fileID: 11400000, guid: ce53e96619ea4c1ca6bc391d0792f801, type: 2}
78+
m_Value: []
8079
--- !u!114 &2091858464068491981
8180
MonoBehaviour:
8281
m_ObjectHideFlags: 3
@@ -117,3 +116,6 @@ MonoBehaviour:
117116
cullingDistance:
118117
m_OverrideState: 0
119118
m_Value: 1000
119+
minSolidAngle:
120+
m_OverrideState: 0
121+
m_Value: 4
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../com.unity.toon-scenes/HDRP

TestProjects/HdrpDX12GraphicsTest-6000.0/Assets/Scenes/AngelRing.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)