Merge branch '4.1' into 4.2-beta

This commit is contained in:
Harald Csaszar 2023-06-01 18:17:55 +02:00
commit 6f5b940d93

View File

@ -14,7 +14,7 @@
#endif #endif
#include "SpineCoreShaders/Spine-Skeleton-Tint-Common.cginc" #include "SpineCoreShaders/Spine-Skeleton-Tint-Common.cginc"
#if defined(_RIM_LIGHTING) || defined(_ADDITIONAL_LIGHTS) || defined(MAIN_LIGHT_CALCULATE_SHADOWS) || defined(_LIGHT_COOKIES) #if defined(_RIM_LIGHTING) || defined(_ADDITIONAL_LIGHTS) || defined(MAIN_LIGHT_CALCULATE_SHADOWS) || defined(USE_LIGHT_COOKIES)
#define NEEDS_POSITION_WS #define NEEDS_POSITION_WS
#endif #endif
@ -358,7 +358,7 @@ half4 ForwardPassFragmentSprite(VertexOutputLWRP input
inputData.normalWS = normalWS; inputData.normalWS = normalWS;
inputData.bakedGI = SAMPLE_GI(input.lightmapUV, input.vertexSH, inputData.normalWS); inputData.bakedGI = SAMPLE_GI(input.lightmapUV, input.vertexSH, inputData.normalWS);
#if defined(_RIM_LIGHTING) || defined(_ADDITIONAL_LIGHTS) #if defined(_RIM_LIGHTING) || defined(_ADDITIONAL_LIGHTS) || defined(USE_LIGHT_COOKIES)
inputData.positionWS = input.positionWS.rgb; inputData.positionWS = input.positionWS.rgb;
#endif #endif
#if defined(_ADDITIONAL_LIGHTS) && USE_FORWARD_PLUS #if defined(_ADDITIONAL_LIGHTS) && USE_FORWARD_PLUS