From 1880447f0b3a6107d07096f8bb9ccd0feb37bed5 Mon Sep 17 00:00:00 2001 From: Sergey Kazantsev Date: Sat, 21 May 2022 06:34:08 +0700 Subject: [PATCH 1/3] [spine-c] Add initialization of mixRotate to transform constraint(SkeletonJson) (#2083) --- spine-c/spine-c/src/spine/SkeletonJson.c | 1 + 1 file changed, 1 insertion(+) diff --git a/spine-c/spine-c/src/spine/SkeletonJson.c b/spine-c/spine-c/src/spine/SkeletonJson.c index 349c83743..4b5be2fee 100644 --- a/spine-c/spine-c/src/spine/SkeletonJson.c +++ b/spine-c/spine-c/src/spine/SkeletonJson.c @@ -1140,6 +1140,7 @@ spSkeletonData *spSkeletonJson_readSkeletonData(spSkeletonJson *self, const char data->offsetScaleY = Json_getFloat(constraintMap, "scaleY", 0); data->offsetShearY = Json_getFloat(constraintMap, "shearY", 0); + data->mixRotate = Json_getFloat(constraintMap, "mixRotate", 1); data->mixX = Json_getFloat(constraintMap, "mixX", 1); data->mixY = Json_getFloat(constraintMap, "mixY", data->mixX); data->mixScaleX = Json_getFloat(constraintMap, "mixScaleX", 1); From 86116f7b2dcf7ac3714a21cfa45969a103dccf74 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 23 May 2022 16:30:05 +0200 Subject: [PATCH 2/3] [unity] Minor: Fixed main object name to match file name to avoid Inspector warnings. --- .../Examples/2D/Example 2D URP Asset.asset | 2 +- .../Examples/2D/Example 2D URP Renderer Data.asset | 2 +- .../Examples/3D/Example URP Asset.asset | 2 +- .../Examples/3D/Example URP Asset_Renderer.asset | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Asset.asset b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Asset.asset index 778ebcfba..61a197342 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Asset.asset +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Asset.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: Demo 2D URP Asset + m_Name: Example 2D URP Asset m_EditorClassIdentifier: k_AssetVersion: 5 k_AssetPreviousVersion: 5 diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Renderer Data.asset b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Renderer Data.asset index 807b17a74..4102af777 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Renderer Data.asset +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/2D/Example 2D URP Renderer Data.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 11145981673336645838492a2d98e247, type: 3} - m_Name: Demo 2D URP Renderer Data + m_Name: Example 2D URP Renderer Data m_EditorClassIdentifier: m_RendererFeatures: [] m_HDREmulationScale: 1 diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset.asset b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset.asset index 4cb3b67fe..2e16a17a2 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset.asset +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: Demo URP Asset + m_Name: Example URP Asset m_EditorClassIdentifier: k_AssetVersion: 5 k_AssetPreviousVersion: 5 diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset_Renderer.asset b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset_Renderer.asset index d8cfbdf57..f77fda628 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset_Renderer.asset +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Examples/3D/Example URP Asset_Renderer.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: Demo URP Asset_Renderer + m_Name: Example URP Asset_Renderer m_EditorClassIdentifier: m_RendererFeatures: [] postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} From 6fc6e090ae22cc04226cd8a20487f0f6ab42dba1 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 24 May 2022 16:31:58 +0200 Subject: [PATCH 3/3] [unity] Fixed rare import error that material.mainTexture is null ("Material is missing texture"). --- .../Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs index d1ae05371..bbf9d6f3d 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs @@ -582,6 +582,8 @@ namespace Spine.Unity.Editor { material = defaultShader != null ? new Material(defaultShader) : null; if (material) { ApplyPMAOrStraightAlphaSettings(material, SpineEditorUtilities.Preferences.textureSettingsReference); + if (texture != null) + material.mainTexture = texture; AssetDatabase.CreateAsset(material, materialPath); } } else { @@ -589,10 +591,8 @@ namespace Spine.Unity.Editor { } if (material != null) { - if (texture != null) { + if (texture != null) material.mainTexture = texture; - } - EditorUtility.SetDirty(material); // note: don't call AssetDatabase.SaveAssets() since this would trigger OnPostprocessAllAssets() every time unnecessarily. populatingMaterials.Add(material); //atlasAsset.materials[i] = mat;