From fa324fd83863b48a4908f0502eda77c1d6e9979b Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 26 Oct 2023 23:02:45 +0200 Subject: [PATCH 1/2] [libgdx] Fix json TransformConstraint timeline mixShearY value being ignored. See commit c8f2370. --- .../src/com/esotericsoftware/spine/SkeletonJson.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index 5c1cbe790..99db77e24 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -821,7 +821,7 @@ public class SkeletonJson extends SkeletonLoader { mixY = mixY2; mixScaleX = mixScaleX2; mixScaleY = mixScaleY2; - mixScaleX = mixScaleX2; + mixShearY = mixShearY2; keyMap = nextMap; } timelines.add(timeline); From 3527b926bd17fb13c342ef58308dec6356abe309 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 26 Oct 2023 23:19:32 +0200 Subject: [PATCH 2/2] [unity] URP shader build error when added to always included shaders. Closes #2406. --- .../Shaders/2D/Spine-Skeleton-URP-2D.shader | 2 +- .../Shaders/2D/Spine-SkeletonLit-URP-2D.shader | 2 +- .../Shaders/Outline/Spine-Skeleton-OutlineOnly-URP.shader | 1 - .../Shaders/Spine-Skeleton-URP.shader | 2 +- .../Shaders/Spine-SkeletonLit-URP.shader | 2 +- .../Shaders/Spine-Sprite-URP.shader | 2 +- .../Modules/com.esotericsoftware.spine.urp-shaders/package.json | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-Skeleton-URP-2D.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-Skeleton-URP-2D.shader index 6e6816500..c57bc8ae4 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-Skeleton-URP-2D.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-Skeleton-URP-2D.shader @@ -64,5 +64,5 @@ Shader "Universal Render Pipeline/2D/Spine/Skeleton" { } } - FallBack "Hidden/InternalErrorShader" + FallBack "Universal Render Pipeline/2D/Sprite-Unlit-Default" } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader index fdfe936b8..c57e8b013 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Spine-SkeletonLit-URP-2D.shader @@ -244,5 +244,5 @@ Shader "Universal Render Pipeline/2D/Spine/Skeleton Lit" { ENDHLSL } } - FallBack "Universal Render Pipeline/2D/Sprite-Lit-Default" + FallBack "Universal Render Pipeline/2D/Spine/Skeleton" } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Outline/Spine-Skeleton-OutlineOnly-URP.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Outline/Spine-Skeleton-OutlineOnly-URP.shader index 5f58688d7..3b9580d1f 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Outline/Spine-Skeleton-OutlineOnly-URP.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Outline/Spine-Skeleton-OutlineOnly-URP.shader @@ -56,6 +56,5 @@ Shader "Universal Render Pipeline/Spine/Outline/Skeleton-OutlineOnly" { } } - FallBack "Hidden/InternalErrorShader" CustomEditor "SpineShaderWithOutlineGUI" } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Skeleton-URP.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Skeleton-URP.shader index 93f60c133..4853d605a 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Skeleton-URP.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Skeleton-URP.shader @@ -139,5 +139,5 @@ Shader "Universal Render Pipeline/Spine/Skeleton" { } } - FallBack "Hidden/InternalErrorShader" + FallBack "Universal Render Pipeline/Unlit" } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-SkeletonLit-URP.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-SkeletonLit-URP.shader index 301c9b5b5..5070ce4ea 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-SkeletonLit-URP.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-SkeletonLit-URP.shader @@ -194,5 +194,5 @@ Shader "Universal Render Pipeline/Spine/Skeleton Lit" { } } - FallBack "Hidden/InternalErrorShader" + FallBack "Universal Render Pipeline/Spine/Skeleton" } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Sprite-URP.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Sprite-URP.shader index d411f1e28..3add9894f 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Sprite-URP.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Spine-Sprite-URP.shader @@ -276,6 +276,6 @@ Shader "Universal Render Pipeline/Spine/Sprite" } } - FallBack "Hidden/InternalErrorShader" + FallBack "Universal Render Pipeline/Spine/Skeleton" CustomEditor "SpineSpriteShaderGUI" } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json index 9df1313b7..181c924df 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.urp-shaders", "displayName": "Spine Universal RP Shaders", "description": "This plugin provides universal render pipeline (URP) shaders for the spine-unity runtime.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.1.26", + "version": "4.1.27", "unity": "2019.3", "author": { "name": "Esoteric Software",