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 6f3c136d0..de9af1dc7 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.addressables/Editor/AddressablesTextureLoaderInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.addressables/Editor/AddressablesTextureLoaderInspector.cs @@ -73,7 +73,7 @@ namespace Spine.Unity.Editor { } } -#region Context Menu Item + #region Context Menu Item [MenuItem("CONTEXT/AtlasAssetBase/Add Addressables Loader")] static void AddAddressablesLoader (MenuCommand cmd) { if (staticMethods == null) 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 8f113d682..9744617fc 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 @@ -232,7 +232,7 @@ namespace Spine.Unity.Editor { loader = (GenericOnDemandTextureLoader)target; if (staticMethods == null) - staticMethods = CreateStaticMethodImplementations (); + staticMethods = CreateStaticMethodImplementations(); } #if NEWPLAYMODECALLBACKS 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 e8a06b8d9..47a02f031 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 @@ -119,7 +119,7 @@ namespace Spine.Unity { if (materialIndex >= placeholderMap.Length) { Debug.LogError(string.Format("Failed to assign placeholder textures at {0}, material #{1} {2}. " + "It seems like the GenericOnDemandTextureLoader asset was not setup accordingly for the AtlasAsset.", - atlasAsset, materialIndex+1, targetMaterial), this); + atlasAsset, materialIndex + 1, targetMaterial), this); return false; } Texture activeTexture = targetMaterial.mainTexture; @@ -139,8 +139,7 @@ namespace Spine.Unity { Debug.LogWarning(string.Format("Placeholder texture set to null at {0}, for material #{1} {2}. " + "It seems like the GenericOnDemandTextureLoader asset was not setup accordingly for the AtlasAsset.", atlasAsset, materialIndex + 1, targetMaterial), this); - } - else { + } else { targetMaterial.mainTexture = placeholderTexture; } ++materialIndex; @@ -258,7 +257,7 @@ namespace Spine.Unity { public abstract Texture GetAlreadyLoadedTexture (int materialIndex, int textureIndex); - public abstract void CreateTextureRequest(TargetReference targetReference, + public abstract void CreateTextureRequest (TargetReference targetReference, MaterialOnDemandData materialData, int textureIndex, Material materialToUpdate); public virtual void UnloadUnusedTextures () {