Merge branch '4.1' into 4.2-beta

This commit is contained in:
Harald Csaszar 2023-01-11 11:50:24 +01:00
commit 7b4dd81fb7
2 changed files with 6 additions and 2 deletions

View File

@ -28,8 +28,10 @@
*****************************************************************************/
using System.Collections.Generic;
using UnityEditor.Animations;
using UnityEngine;
#if UNITY_EDITOR
using UnityEditor.Animations;
#endif
namespace Spine.Unity {
[RequireComponent(typeof(Animator))]

View File

@ -51,8 +51,10 @@
#define SPINE_OPTIONAL_MATERIALOVERRIDE
using System.Collections.Generic;
using UnityEditor.SceneManagement;
using UnityEngine;
#if UNITY_EDITOR
using UnityEditor.SceneManagement;
#endif
namespace Spine.Unity {
/// <summary>Base class of animated Spine skeleton components. This component manages and renders a skeleton.</summary>