mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-21 09:46:02 +08:00
Merge branch '4.1' into 4.2-beta
This commit is contained in:
commit
6f5b940d93
@ -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
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user