Skip to content

Commit 1df31c6

Browse files
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/Graphics into HDRP/staging
2 parents 401b4ed + db945ce commit 1df31c6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

TestProjects/HDRP_DXR_Tests/Packages/manifest.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"com.unity.timeline": "1.2.6",
2121
"com.unity.ugui": "1.0.0",
2222
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
23-
"com.unity.xr.legacyinputhelpers": "2.1.2",
2423
"com.unity.modules.ai": "1.0.0",
2524
"com.unity.modules.androidjni": "1.0.0",
2625
"com.unity.modules.animation": "1.0.0",

TestProjects/HDRP_DXR_Tests/ProjectSettings/EditorSettings.asset

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 10
6+
serializedVersion: 11
77
m_SerializationMode: 2
88
m_LineEndingsForNewScripts: 2
99
m_DefaultBehaviorMode: 0
@@ -25,6 +25,7 @@ EditorSettings:
2525
m_EnterPlayModeOptions: 3
2626
m_UseLegacyProbeSampleCount: 1
2727
m_SerializeInlineMappingsOnOneLine: 0
28+
m_DisableCookiesInLightmapper: 0
2829
m_AssetPipelineMode: 1
2930
m_CacheServerMode: 0
3031
m_CacheServerEndpoint:

TestProjects/HDRP_DXR_Tests/ProjectSettings/GraphicsSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ GraphicsSettings:
2828
m_LensFlare:
2929
m_Mode: 1
3030
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
31+
m_VideoShadersIncludeMode: 2
3132
m_AlwaysIncludedShaders:
3233
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
3334
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -64,4 +65,3 @@ GraphicsSettings:
6465
m_LightsUseLinearIntensity: 1
6566
m_LightsUseColorTemperature: 1
6667
m_LogWhenShaderIsCompiled: 0
67-
m_AllowEnlightenSupportForUpgradedProject: 1

0 commit comments

Comments
 (0)