Skip to content

Commit 1f72368

Browse files
author
Tatami
committed
Merge branch 'main' into feature/tint-color-flipbook
2 parents af1a44d + 010c60e commit 1f72368

4 files changed

Lines changed: 6 additions & 2 deletions

File tree

Assets/Nova/Runtime/Core/Shaders/ParticlesUberLit.shader

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ Shader "Nova/Particles/UberLit"
242242
#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
243243
#pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
244244
#pragma multi_compile_fragment _ _SHADOWS_SOFT
245+
#pragma multi_compile _ _FORWARD_PLUS
246+
#include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
245247
#if UNITY_VERSION >= 60000000
246248
#pragma multi_compile _ EVALUATE_SH_MIXED EVALUATE_SH_VERTEX
247249
#include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ProbeVolumeVariants.hlsl"

Assets/Nova/Runtime/Core/Shaders/UIParticlesUberLit.shader

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ Shader "Nova/UIParticles/UberLit"
257257
#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
258258
#pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
259259
#pragma multi_compile_fragment _ _SHADOWS_SOFT
260+
#pragma multi_compile _ _FORWARD_PLUS
261+
#include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
260262

261263
// Render Settings
262264
#pragma shader_feature_local_fragment _VERTEX_ALPHA_AS_TRANSITION_PROGRESS

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"com.nowsprinting.test-helper": "1.0.0",
66
"com.unity.ai.navigation": "1.1.5",
77
"com.unity.collab-proxy": "2.6.0",
8-
"com.unity.ide.rider": "3.0.34",
8+
"com.unity.ide.rider": "3.0.36",
99
"com.unity.ide.visualstudio": "2.0.22",
1010
"com.unity.probuilder": "5.2.3",
1111
"com.unity.render-pipelines.universal": "14.0.11",

Packages/packages-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"url": "https://packages.unity.com"
9292
},
9393
"com.unity.ide.rider": {
94-
"version": "3.0.34",
94+
"version": "3.0.36",
9595
"depth": 0,
9696
"source": "registry",
9797
"dependencies": {

0 commit comments

Comments
 (0)