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 d1e88af45..866aba429 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 @@ -55,6 +55,10 @@ #define HAS_PACKAGE_INFO #endif +#if UNITY_2018_2_OR_NEWER +#define HAS_BATCHMODE_QUERY +#endif + using System.Collections.Generic; using System.IO; using System.Linq; @@ -817,6 +821,9 @@ namespace Spine.Unity.Editor { /// True if automatic fixing by switching to suitable settings was selected. static bool ShowWorkflowMismatchDialog (SpineAtlasAsset atlasAsset, bool isLinearPMAMismatch, bool atlasIsPMA) { +#if HAS_BATCHMODE_QUERY + if (Application.isBatchMode) return false; +#endif string atlasFileName = atlasAsset.atlasFile.name; Selection.activeObject = atlasAsset.atlasFile; EditorGUIUtility.PingObject(atlasAsset.atlasFile); diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/ComponentUpgradeWarningDialog.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/ComponentUpgradeWarningDialog.cs index 7e42a766d..69483c646 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/ComponentUpgradeWarningDialog.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/ComponentUpgradeWarningDialog.cs @@ -31,6 +31,10 @@ #define HAS_MODAL_UTILITY #endif +#if UNITY_2018_2_OR_NEWER +#define HAS_BATCHMODE_QUERY +#endif + using UnityEditor; using UnityEngine; @@ -52,7 +56,9 @@ namespace Spine.Unity.Editor { private static ComponentUpgradeWarningDialog currentWindow; public static DialogResult ShowDialog () { - +#if HAS_BATCHMODE_QUERY + if (Application.isBatchMode) return DialogResult.None; +#endif if (currentWindow != null) { currentWindow.Close(); } diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json index f8b60ef90..e5a25f481 100644 --- a/spine-unity/Assets/Spine/package.json +++ b/spine-unity/Assets/Spine/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.spine-unity", "displayName": "spine-unity Runtime", "description": "This plugin provides the spine-unity runtime core and examples. Spine Examples can be installed via the Samples tab.", - "version": "4.3.20", + "version": "4.3.21", "unity": "2018.3", "author": { "name": "Esoteric Software",