UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed runtime import hanging on "Importing small assets" in Unity 2019.3 and creating multiple Assets/Editor1, Assets/Editor2, etc dirs. Closes #1384.

Browse Source
This commit is contained in:
Harald Csaszar 2019-06-18 15:58:26 +02:00
parent e8866cc730
commit b792cc4b73
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpinePreferences.cs
View File

@ -41,11 +41,17 @@
using UnityEngine; using UnityEngine;
using UnityEditor; using UnityEditor;
using System.Threading;
namespace Spine.Unity.Editor { namespace Spine.Unity.Editor {
public class SpinePreferences : ScriptableObject { public class SpinePreferences : ScriptableObject {
#if NEW_PREFERENCES_SETTINGS_PROVIDER
static int wasPreferencesDirCreated = 0;
static int wasPreferencesAssetCreated = 0;
#endif
public const string SPINE_SETTINGS_ASSET_PATH = "Assets/Editor/SpineSettings.asset"; public const string SPINE_SETTINGS_ASSET_PATH = "Assets/Editor/SpineSettings.asset";
#if SPINE_TK2D #if SPINE_TK2D
@ -99,10 +105,13 @@ namespace Spine.Unity.Editor {
{ {
settings = ScriptableObject.CreateInstance<SpinePreferences>(); settings = ScriptableObject.CreateInstance<SpinePreferences>();
SpineEditorUtilities.OldPreferences.CopyOldToNewPreferences(ref settings); SpineEditorUtilities.OldPreferences.CopyOldToNewPreferences(ref settings);
if (!AssetDatabase.IsValidFolder("Assets/Editor")) // Multiple threads may be calling this method during import, creating the folder
// multiple times with ascending number suffix. Atomic wasPreferencesDirCreated int
// variable is used to prevent any redundant create operations.
if (!AssetDatabase.IsValidFolder("Assets/Editor") && Interlocked.Exchange(ref wasPreferencesDirCreated, 1) == 0)
AssetDatabase.CreateFolder("Assets", "Editor"); AssetDatabase.CreateFolder("Assets", "Editor");
AssetDatabase.CreateAsset(settings, SPINE_SETTINGS_ASSET_PATH); if (Interlocked.Exchange(ref wasPreferencesAssetCreated, 1) == 0)
AssetDatabase.SaveAssets(); AssetDatabase.CreateAsset(settings, SPINE_SETTINGS_ASSET_PATH);
} }
return settings; return settings;
} }