diff --git a/spine-c/spine-c/src/spine/MeshAttachment.c b/spine-c/spine-c/src/spine/MeshAttachment.c index 3657900ad..e62c074c2 100644 --- a/spine-c/spine-c/src/spine/MeshAttachment.c +++ b/spine-c/spine-c/src/spine/MeshAttachment.c @@ -43,7 +43,6 @@ void _spMeshAttachment_dispose(spAttachment *attachment) { FREE(self->edges); } else _spAttachment_deinit(attachment); - if (self->sequence) FREE(self->sequence); FREE(self); } diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Private/SpineEditorPlugin.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Private/SpineEditorPlugin.cpp index c95f82d59..3945076c6 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Private/SpineEditorPlugin.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Private/SpineEditorPlugin.cpp @@ -31,20 +31,18 @@ #include "AssetTypeActions_Base.h" #include "SpineAtlasAsset.h" #include "SpineSkeletonDataAsset.h" - -class FSpineAtlasAssetTypeActions : public FAssetTypeActions_Base -{ + +class FSpineAtlasAssetTypeActions : public FAssetTypeActions_Base { public: - UClass* GetSupportedClass() const override { return USpineAtlasAsset::StaticClass(); }; + UClass *GetSupportedClass() const override { return USpineAtlasAsset::StaticClass(); }; FText GetName() const override { return INVTEXT("Spine atlas asset"); }; FColor GetTypeColor() const override { return FColor::Red; }; uint32 GetCategories() override { return EAssetTypeCategories::Misc; }; }; -class FSpineSkeletonDataAssetTypeActions : public FAssetTypeActions_Base -{ +class FSpineSkeletonDataAssetTypeActions : public FAssetTypeActions_Base { public: - UClass* GetSupportedClass() const override { return USpineSkeletonDataAsset::StaticClass(); }; + UClass *GetSupportedClass() const override { return USpineSkeletonDataAsset::StaticClass(); }; FText GetName() const override { return INVTEXT("Spine data asset"); }; FColor GetTypeColor() const override { return FColor::Red; }; uint32 GetCategories() override { return EAssetTypeCategories::Misc; }; diff --git a/spine-ue4/README.md b/spine-ue4/README.md index 387442d7d..e4f765428 100644 --- a/spine-ue4/README.md +++ b/spine-ue4/README.md @@ -1,5 +1,5 @@ # spine-ue4 -The spine-ue4 runtime provides functionality to load, manipulate and render [Spine](http://esotericsoftware.com) skeletal animation data using [Unreal Engine 4.21+](https://www.unrealengine.com/). spine-ue4 is based on [spine-cpp](../spine-cpp). +The spine-ue4 runtime provides functionality to load, manipulate and render [Spine](http://esotericsoftware.com) skeletal animation data using [Unreal Engine 4.27-5.2](https://www.unrealengine.com/). spine-ue4 is based on [spine-cpp](../spine-cpp). ## Licensing @@ -34,7 +34,7 @@ See the [Spine Runtimes documentation](http://esotericsoftware.com/spine-documen ## Example ### [Please see the spine-ue4 guide for full documentation](http://esotericsoftware.com/spine-ue4) -The Spine UE4 example works on all platforms supported by Unreal Engine. The samples require Unreal Engine 4.25+. +The Spine UE4 example works on all platforms supported by Unreal Engine. The samples require Unreal Engine 4.27-5.2. 1. Copy the `spine-cpp` folder from this repositories root directory to your `Plugins/SpinePlugin/Sources/SpinePlugin/Public/` directory. You can run the `setup.bat` or `setup.sh` scripts to accomplish this. 2. Open the SpineUE4.uproject file with Unreal Editor diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs index ff963b8c3..fac6c783a 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs @@ -970,8 +970,7 @@ namespace Spine.Unity { atlasAsset.RequireTextureLoaded(this.mainTexture, ref loadedTexture, null); if (loadedTexture) this.baseTexture = loadedTexture; - } - else { + } else { Texture[] textureItems = usedTextures.Items; for (int i = 0, count = usedTextures.Count; i < count; ++i) { Texture loadedTexture = null; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs index 7ad153045..fa17e9d98 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs @@ -167,7 +167,7 @@ namespace Spine.Unity { } public override void LateUpdate () { - if (updateTiming == UpdateTiming.InLateUpdate && valid && translator != null && translator.Animator != null) + if (updateTiming == UpdateTiming.InLateUpdate && valid && translator != null && translator.Animator != null) UpdateAnimation(); // instantiation can happen from Update() after this component, leading to a missing Update() call. if (!wasUpdatedAfterInit) Update(); diff --git a/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Runtime/GenericOnDemandTextureLoader.cs b/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Runtime/GenericOnDemandTextureLoader.cs index 5025701b5..95e33ce19 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Runtime/GenericOnDemandTextureLoader.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.on-demand-loading/Runtime/GenericOnDemandTextureLoader.cs @@ -261,7 +261,7 @@ namespace Spine.Unity { } protected virtual Texture RequestLoadTexture (Material material, int materialIndex, int textureIndex, - System.Action onTextureLoaded) { + System.Action onTextureLoaded) { PlaceholderTextureMapping[] placeholderTextures = placeholderMap[materialIndex].textures; TargetReference targetReference = placeholderTextures[textureIndex].targetTextureReference;