UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed SkeletonRenderer Mask Interaction not being persisted on 4.3 branch. Closes #3004.

Browse Source
This commit is contained in:
Harald Csaszar 2026-01-08 13:04:25 +01:00
parent 5ab48156b4
commit b07297d743
6 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/ISkeletonRendererInspector.cs
View File

@ -37,10 +37,6 @@
#define PER_MATERIAL_PROPERTY_BLOCKS #define PER_MATERIAL_PROPERTY_BLOCKS
#endif #endif
#if UNITY_2017_1_OR_NEWER
#define BUILT_IN_SPRITE_MASK_COMPONENT
#endif
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;

4
spine-unity/Assets/Spine/Runtime/spine-unity/Components/Base/SkeletonAnimationBase.cs
View File

@ -35,10 +35,6 @@
#define PER_MATERIAL_PROPERTY_BLOCKS #define PER_MATERIAL_PROPERTY_BLOCKS
#endif #endif
#if UNITY_2017_1_OR_NEWER
#define BUILT_IN_SPRITE_MASK_COMPONENT
#endif
#if UNITY_2019_3_OR_NEWER #if UNITY_2019_3_OR_NEWER
#define CONFIGURABLE_ENTER_PLAY_MODE #define CONFIGURABLE_ENTER_PLAY_MODE
#endif #endif

4
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.Common.cs
View File

@ -35,10 +35,6 @@
#define PER_MATERIAL_PROPERTY_BLOCKS #define PER_MATERIAL_PROPERTY_BLOCKS
#endif #endif
#if UNITY_2017_1_OR_NEWER
#define BUILT_IN_SPRITE_MASK_COMPONENT
#endif
#if UNITY_2019_3_OR_NEWER #if UNITY_2019_3_OR_NEWER
#define CONFIGURABLE_ENTER_PLAY_MODE #define CONFIGURABLE_ENTER_PLAY_MODE
#endif #endif

4
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.Common.cs
View File

@ -35,10 +35,6 @@
#define PER_MATERIAL_PROPERTY_BLOCKS #define PER_MATERIAL_PROPERTY_BLOCKS
#endif #endif
#if UNITY_2017_1_OR_NEWER
#define BUILT_IN_SPRITE_MASK_COMPONENT
#endif
#if UNITY_2019_3_OR_NEWER #if UNITY_2019_3_OR_NEWER
#define CONFIGURABLE_ENTER_PLAY_MODE #define CONFIGURABLE_ENTER_PLAY_MODE
#endif #endif

2
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs
View File

@ -121,7 +121,7 @@ namespace Spine.Unity {
#if BUILT_IN_SPRITE_MASK_COMPONENT #if BUILT_IN_SPRITE_MASK_COMPONENT
/// <seealso cref="MaskInteraction"/> /// <seealso cref="MaskInteraction"/>
protected SpriteMaskInteraction maskInteraction = SpriteMaskInteraction.None; [SerializeField] protected SpriteMaskInteraction maskInteraction = SpriteMaskInteraction.None;
/// <summary>Cached reference to the already setup material override set at the respective /// <summary>Cached reference to the already setup material override set at the respective
/// SkeletonDataAsset.atlasAssets array entry.</summary> /// SkeletonDataAsset.atlasAssets array entry.</summary>

2
spine-unity/Assets/Spine/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity", "name": "com.esotericsoftware.spine.spine-unity",
"displayName": "spine-unity Runtime", "displayName": "spine-unity Runtime",
"description": "This plugin provides the spine-unity runtime core and examples. Spine Examples can be installed via the Samples tab.", "description": "This plugin provides the spine-unity runtime core and examples. Spine Examples can be installed via the Samples tab.",
"version": "4.3.35", "version": "4.3.36",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",