diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp index 6d26bd57f..c96caaf5d 100644 --- a/spine-godot/spine_godot/SpineSprite.cpp +++ b/spine-godot/spine_godot/SpineSprite.cpp @@ -770,7 +770,7 @@ void SpineSprite::update_meshes(Ref skeleton_ref) { mesh_instance->colors.set(j, Color(tint.r, tint.g, tint.b, tint.a)); } - auto indices_changed = true; + auto indices_changed = false; if (mesh_instance->indices.size() == indices->size()) { auto old_indices = mesh_instance->indices.ptr(); auto new_indices = indices->buffer(); @@ -780,6 +780,8 @@ void SpineSprite::update_meshes(Ref skeleton_ref) { break; } } + } else { + indices_changed = true; } if (indices_changed) { diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs index be36773da..58168f661 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs @@ -46,7 +46,7 @@ namespace Spine.Unity.Editor { /// [SUPPORTS] /// Linear, Constant, and Bezier Curves* /// Inverse Kinematics* - /// Inherit Rotation + /// Disabled Inherit Rotation, unless combined with negative scale /// Translate Timeline /// Rotate Timeline /// Scale Timeline** diff --git a/spine-unity/Modules/com.esotericsoftware.spine.addressables/Editor/AddressablesTextureLoaderInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.addressables/Editor/AddressablesTextureLoaderInspector.cs index f0af3df67..592f5e41e 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.addressables/Editor/AddressablesTextureLoaderInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.addressables/Editor/AddressablesTextureLoaderInspector.cs @@ -45,9 +45,18 @@ namespace Spine.Unity.Editor { using PlaceholderMaterialMapping = AddressablesTextureLoader.PlaceholderMaterialMapping; using PlaceholderTextureMapping = AddressablesTextureLoader.PlaceholderTextureMapping; + [InitializeOnLoad] [CustomEditor(typeof(AddressablesTextureLoader)), CanEditMultipleObjects] public class AddressablesTextureLoaderInspector : GenericTextureLoaderInspector { + // Note: This static ctor ensures the generic base class method RegisterPlayModeChangedCallbacks is + // definitely called via InitializeOnLoad. Otherwise problems arose where the base class static ctor code + // is not executed (related to being a generic class). + static AddressablesTextureLoaderInspector () { + // The call below is necessary, otherwise the static GenericTextureLoaderInspector ctor is not called. + GenericTextureLoaderInspector.RegisterPlayModeChangedCallbacks(); + } + public class AddressablesMethodImplementations : StaticMethodImplementations { public override string LoaderSuffix { get { return "_Addressable"; } } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.addressables/package.json b/spine-unity/Modules/com.esotericsoftware.spine.addressables/package.json index f2ae6d3e0..d45559caa 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.addressables/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.addressables/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.addressables", "displayName": "Spine Addressables Extensions [Experimental]", "description": "This experimental plugin provides integration of Addressables on-demand texture loading for the spine-unity runtime.\nPlease be sure to test this package first and create backups of your project before using.\n\nUsage: First declare your target Material textures as addressable. Then select the SpineAtlasAsset, right-click the SpineAtlasAsset Inspector heading and select 'Add Addressables Loader'. This generates an 'AddressableTextureLoader' asset providing configuration parameters and sets up low-resolution placeholder textures which are automatically assigned in a pre-build step when building your game executable.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime (via the spine-unity unitypackage), version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.1.0-preview.2", + "version": "4.1.0-preview.3", "unity": "2018.3", "author": { "name": "Esoteric Software", diff --git a/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Editor/GenericOnDemandTextureLoaderInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Editor/GenericOnDemandTextureLoaderInspector.cs index 786e1b8b7..50ce4aceb 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Editor/GenericOnDemandTextureLoaderInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Editor/GenericOnDemandTextureLoaderInspector.cs @@ -71,9 +71,15 @@ namespace Spine.Unity.Editor { /// Called via InitializeOnLoad attribute upon Editor startup or compilation. /// static GenericOnDemandTextureLoaderInspector () { + RegisterPlayModeChangedCallbacks(); + } + + public static void RegisterPlayModeChangedCallbacks () { #if NEWPLAYMODECALLBACKS + EditorApplication.playModeStateChanged -= OnPlaymodeChanged; EditorApplication.playModeStateChanged += OnPlaymodeChanged; #else + EditorApplication.playmodeStateChanged -= OnPlaymodeChanged; EditorApplication.playmodeStateChanged += OnPlaymodeChanged; #endif } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/package.json b/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/package.json index 88ff77e98..61c36ba02 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.on-demand-loading", "displayName": "Spine On-Demand Loading Extensions [Experimental]", "description": "This experimental plugin provides a generic basic implementation of on-demand texture loading for the spine-unity runtime. You might want to use the available com.esotericsoftware.spine.addressables package which depends on this package.\nPlease be sure to test this package first and create backups of your project before using.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime (via the spine-unity unitypackage), version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.1.0-preview.2", + "version": "4.1.0-preview.3", "unity": "2018.3", "author": { "name": "Esoteric Software",