diff --git a/CHANGELOG.md b/CHANGELOG.md index 5388c5c9d..c2818734d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -134,6 +134,11 @@ * **Removed redundant `Attachment.GetClone()` and `MeshAttachment.GetLinkedClone()` extension methods**. Use methods `Attachment.Copy` and `MeshAttachment.NewLinkedMesh()` instead. * **Renamed extension method `Attachment.GetClone(bool cloneMeshesAsLinked)` to `Attachment.GetCopy(bool cloneMeshesAsLinked)`** to follow the naming scheme of the Spine API. * **Changed `MeshAttachment.GetLinkedMesh()` method signatures:** removed optional parameters `bool inheritDeform = true, bool copyOriginalProperties = false`. + * Changed namespace `Spine.Unity.Modules` to `Spine.Unity` and `Spine.Unity.Examples` after restructuring (see section below) in respective classes: + * When receiving namespace related errors, replace using statements of `using Spine.Unity.Modules.AttachmentTools;` with `using Spine.Unity.AttachmentTools;`. You can remove `using Spine.Unity.Modules;` statements when a `using Spine.Unity` statement is already present in the file. + * `AttachmentTools`, `SkeletonPartsRenderer`, `SkeletonRenderSeparator`, `SkeletonRendererCustomMaterials` changed to namespace `Spine.Unity`. + * `SkeletonGhost`, `SkeletonGhostRenderer`, `AtlasRegionAttacher`, `SkeletonGraphicMirror`, `SkeletonRagdoll`, `SkeletonRagdoll2D`, `SkeletonUtilityEyeConstraint`, `SkeletonUtilityGroundConstraint`, `SkeletonUtilityKinematicShadow` changed to namespace `Spine.Unity.Examples`. + * **Additions** * **Spine Preferences stored in Assets/Editor/SpineSettings.asset** Now Spine uses the new `SettingsProvider` API, storing settings in a SpineSettings.asset file which can be shared with team members. Your old preferences are automatically migrated to the new system. @@ -142,7 +147,7 @@ * Added `Create 2D Hinge Chain` button at `SkeletonUtilityBone` inspector, previously only `Create 3D Hinge Chain` was available. * **Now supporting Lightweight Render Pipeline (LWRP) through an additional UPM package.** * **Installation:** You can download the Unity Package Manager (UPM) package via the [download page](http://esotericsoftware.com/spine-unity-download) or find it in the [spine-runtimes/spine-unity/Packages](https://github.com/EsotericSoftware/spine-runtimes/tree/3.8-beta/spine-unity/Packages) subdirectory on the git repository. You can then either unzip (copy if using git) the package to - a) the `Packages` directory in your project where it will automatically be loaded, or + a) the `Packages` directory in your project where it will automatically be loaded, or b) to an arbitrary directory outside the Assets directory and then open Package Manager in Unity, select the `+` icon, choose `Add package from disk..` and point it to the package.json file. The Project panel should now show an entry `Spine Lightweight RP Shaders` under `Packages`. If the directory is not yet listed, you will need to close and re-open Unity to have it display the directory and its contents. * **Usage:** The package provides two shaders specifically built for the lightweight render pipeline: @@ -151,7 +156,7 @@ * **Restrictions** As all Spine shaders, the LWRP shaders **do not support `Premultiply alpha` (PMA) atlas textures in Linear color space**. Please export your atlas textures as `straight alpha` textures with disabled `Premultiply alpha` setting when using Linear color space. You can check the current color space via `Project Settings - Player - Other Settings - Color Space.`. * **Example:** You can find an example scene in the package under `com.esotericsoftware.spine.lwrp-shaders-3.8/Examples/LWRP Shaders.unity` that demonstrates usage of the LWRP shaders. -* **Removed / Deprecated** +* **Deprecated** * Deprecated `Modules/SlotBlendModes/SlotBlendModes` component. Changed namespace from `Spine.Unity.Modules` to `Spine.Unity.Deprecated`. Moved to `Deprecated/SlotBlendModes`. * **Restructuring (Non-Breaking)** diff --git a/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs b/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs index bc0d2b9fd..991054d75 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/MecanimAnimationMatchModifier/AnimationMatchModifierAsset.cs @@ -34,7 +34,7 @@ using UnityEngine; using Spine; using Spine.Unity; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { //[CreateAssetMenu(menuName = "Spine/SkeletonData Modifiers/Animation Match", order = 200)] public class AnimationMatchModifierAsset : SkeletonDataModifierAsset { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipSystemExample.cs b/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipSystemExample.cs index 7750f2d76..066df90f3 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipSystemExample.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipSystemExample.cs @@ -31,7 +31,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Spine.Unity.Modules.AttachmentTools; +using Spine.Unity.AttachmentTools; namespace Spine.Unity.Examples { public class EquipSystemExample : MonoBehaviour, IHasSkeletonDataAsset { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs b/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs index 79d054c83..d7b3b8092 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs @@ -31,7 +31,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Spine.Unity.Modules.AttachmentTools; +using Spine.Unity.AttachmentTools; namespace Spine.Unity.Examples { public class EquipsVisualsComponentExample : MonoBehaviour { diff --git a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs index 61db45b79..0d3849457 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs @@ -28,7 +28,7 @@ *****************************************************************************/ using UnityEngine; -using Spine.Unity.Modules.AttachmentTools; +using Spine.Unity.AttachmentTools; using System.Collections; namespace Spine.Unity.Examples { diff --git a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs index e698b2cb6..4b42e12cf 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs @@ -28,7 +28,7 @@ *****************************************************************************/ using UnityEngine; -using Spine.Unity.Modules.AttachmentTools; +using Spine.Unity.AttachmentTools; using System.Collections; namespace Spine.Unity.Examples { diff --git a/spine-unity/Assets/Spine Examples/Scripts/RaggedySpineboy.cs b/spine-unity/Assets/Spine Examples/Scripts/RaggedySpineboy.cs index ab535b773..bddeb13d3 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/RaggedySpineboy.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/RaggedySpineboy.cs @@ -38,11 +38,11 @@ namespace Spine.Unity.Examples { public float restoreDuration = 0.5f; public Vector2 launchVelocity = new Vector2(50,100); - Spine.Unity.Modules.SkeletonRagdoll2D ragdoll; + Spine.Unity.Examples.SkeletonRagdoll2D ragdoll; Collider2D naturalCollider; void Start () { - ragdoll = GetComponent(); + ragdoll = GetComponent(); naturalCollider = GetComponent(); } diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs index f3599b91e..752fe0b0f 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs @@ -30,7 +30,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using Spine.Unity.Modules.AttachmentTools; +using Spine.Unity.AttachmentTools; namespace Spine.Unity.Examples { public class CombinedSkin : MonoBehaviour { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs index 1316113e5..7932250ae 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhost.cs @@ -32,7 +32,7 @@ using UnityEngine; using System.Collections.Generic; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { [RequireComponent(typeof(SkeletonRenderer))] public class SkeletonGhost : MonoBehaviour { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs index ba7120735..ad2dcc203 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Ghost/SkeletonGhostRenderer.cs @@ -32,7 +32,7 @@ using UnityEngine; using System.Collections; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { public class SkeletonGhostRenderer : MonoBehaviour { static readonly Color32 TransparentBlack = new Color32(0, 0, 0, 0); const string colorPropertyName = "_Color"; diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs index 5272e82ae..a88116367 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs @@ -30,9 +30,9 @@ using UnityEngine; using System.Collections.Generic; using Spine; -using Spine.Unity.Modules.AttachmentTools; +using Spine.Unity.AttachmentTools; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { /// /// Example code for a component that replaces the default attachment of a slot with an image from a Spine atlas. public class AtlasRegionAttacher : MonoBehaviour { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs index eed1f0661..29c0e71c9 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs @@ -31,7 +31,7 @@ using UnityEngine; using System.Collections.Generic; -using Spine.Unity.Modules.AttachmentTools; +using Spine.Unity.AttachmentTools; namespace Spine.Unity.Examples { public class SpriteAttacher : MonoBehaviour { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs index 8e59a72f4..01c83e20a 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonGraphicMirror.cs @@ -31,7 +31,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { public class SkeletonGraphicMirror : MonoBehaviour { public SkeletonRenderer source; diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs index 9c4b04275..b6211c857 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdoll2DInspector.cs @@ -32,6 +32,6 @@ using UnityEngine; using UnityEditor; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { public class SkeletonRagdoll2DInspector {} } diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs index 118c64b18..5ef03a5b5 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/Editor/SkeletonRagdollInspector.cs @@ -32,7 +32,7 @@ using UnityEngine; using UnityEditor; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { public class SkeletonRagdollInspector : UnityEditor.Editor { [CustomPropertyDrawer(typeof(SkeletonRagdoll.LayerFieldAttribute))] diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs index 2336273f3..b09c7057c 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs @@ -33,7 +33,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { [RequireComponent(typeof(SkeletonRenderer))] public class SkeletonRagdoll : MonoBehaviour { static Transform parentSpaceHelper; diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs index 88949f7ed..49de0250d 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs @@ -33,7 +33,7 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { [RequireComponent(typeof(SkeletonRenderer))] public class SkeletonRagdoll2D : MonoBehaviour { static Transform parentSpaceHelper; diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs index 888e17fa6..3683929b4 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityEyeConstraint.cs @@ -30,7 +30,7 @@ using UnityEngine; using System.Collections; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { public class SkeletonUtilityEyeConstraint : SkeletonUtilityConstraint { public Transform[] eyes; public float radius = 0.5f; diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs index 238db6a5c..39a83b9e6 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityGroundConstraint.cs @@ -33,7 +33,7 @@ using UnityEngine; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { #if NEW_PREFAB_SYSTEM [ExecuteAlways] diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs index 85f922f1f..b44d6bae6 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonUtilityKinematicShadow.cs @@ -30,7 +30,7 @@ using UnityEngine; using System.Collections.Generic; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { // SkeletonUtilityKinematicShadow allows hinge chains to inherit a velocity interpreted from changes in parent transform position or from unrelated rigidbodies. // Note: Uncheck "useRootTransformIfNull diff --git a/spine-unity/Assets/Spine Examples/Scripts/SpineboyPole.cs b/spine-unity/Assets/Spine Examples/Scripts/SpineboyPole.cs index ea8c8bc7b..05d74dd97 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/SpineboyPole.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/SpineboyPole.cs @@ -31,7 +31,7 @@ using UnityEngine; using System.Collections; using Spine.Unity; -using Spine.Unity.Modules; +using Spine.Unity.Examples; namespace Spine.Unity.Examples { public class SpineboyPole : MonoBehaviour { diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs index b08ac8976..71186ecc6 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonRendererCustomMaterialsInspector.cs @@ -37,7 +37,7 @@ using System.Linq; using System.Reflection; using UnityEditor; using UnityEngine; -using Spine.Unity.Modules; +using Spine.Unity.Examples; namespace Spine.Unity.Editor { diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs index 296039650..cae90ce2a 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonPartsRendererInspector.cs @@ -31,7 +31,7 @@ using UnityEngine; using UnityEditor; using Spine.Unity.Editor; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { [CustomEditor(typeof(SkeletonPartsRenderer))] public class SkeletonRenderPartInspector : UnityEditor.Editor { SpineInspectorUtility.SerializedSortingProperties sortingProperties; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs index 49988a155..3b39dcc0e 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/SkeletonRenderSeparator/Editor/SkeletonRenderSeparatorInspector.cs @@ -35,7 +35,7 @@ using System.Collections.Generic; using Spine.Unity; using Spine.Unity.Editor; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { [CustomEditor(typeof(SkeletonRenderSeparator))] public class SkeletonRenderSeparatorInspector : UnityEditor.Editor { diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs index 6843f96d9..070cc4cc3 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonPartsRenderer.cs @@ -29,7 +29,7 @@ using UnityEngine; -namespace Spine.Unity.Modules { +namespace Spine.Unity { [RequireComponent(typeof(MeshRenderer), typeof(MeshFilter))] public class SkeletonPartsRenderer : MonoBehaviour { diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs index e2c37647b..707290a53 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderSeparator/SkeletonRenderSeparator.cs @@ -35,7 +35,7 @@ using UnityEngine; using System.Collections.Generic; -namespace Spine.Unity.Modules { +namespace Spine.Unity { #if NEW_PREFAB_SYSTEM [ExecuteAlways] @@ -67,7 +67,7 @@ namespace Spine.Unity.Modules { public bool copyPropertyBlock = true; [Tooltip("Copies MeshRenderer flags into each parts renderer")] public bool copyMeshRendererFlags = true; - public List partsRenderers = new List(); + public List partsRenderers = new List(); #if UNITY_EDITOR void Reset () { diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs index 0441c159b..898dbf8b5 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs @@ -38,7 +38,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace Spine.Unity.Modules { +namespace Spine.Unity { #if NEW_PREFAB_SYSTEM [ExecuteAlways] #else diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs index cba045633..cb046318e 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AttachmentTools.cs @@ -31,7 +31,7 @@ using UnityEngine; using System.Collections.Generic; using System.Collections; -namespace Spine.Unity.Modules.AttachmentTools { +namespace Spine.Unity.AttachmentTools { public static class AttachmentRegionExtensions { #region GetRegion ///