diff --git a/Packages/net.gatosyocora.vrcavatareditor/Editor/Models/VRCAvatar3.cs b/Packages/net.gatosyocora.vrcavatareditor/Editor/Models/VRCAvatar3.cs index bc34fe4..1d170d6 100644 --- a/Packages/net.gatosyocora.vrcavatareditor/Editor/Models/VRCAvatar3.cs +++ b/Packages/net.gatosyocora.vrcavatareditor/Editor/Models/VRCAvatar3.cs @@ -1,5 +1,4 @@ -#if VRC_SDK_VRCSDK3 -using System; +using System; using System.Linq; using UnityEditor.Animations; using UnityEngine; @@ -213,5 +212,4 @@ public void SetAnimSavedFolderPath() AnimSavedFolderPath = GetAnimSavedFolderPath(FxController); } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Packages/net.gatosyocora.vrcavatareditor/Editor/Utilities/VRCAvatarAnimationUtility.cs b/Packages/net.gatosyocora.vrcavatareditor/Editor/Utilities/VRCAvatarAnimationUtility.cs index 7a6b4ad..641a746 100644 --- a/Packages/net.gatosyocora.vrcavatareditor/Editor/Utilities/VRCAvatarAnimationUtility.cs +++ b/Packages/net.gatosyocora.vrcavatareditor/Editor/Utilities/VRCAvatarAnimationUtility.cs @@ -6,10 +6,8 @@ using UnityEngine; using VRCAvatarEditor.Base; using VRCAvatarEditor.Avatars3; -#if VRC_SDK_VRCSDK3 using VRC.SDK3.Avatars.Components; using static VRC.SDK3.Avatars.Components.VRCAvatarDescriptor; -#endif namespace VRCAvatarEditor.Utilities { @@ -98,7 +96,6 @@ public static ChildAnimatorState GetFXLayerIdleState(AnimatorController controll .stateMachine.states .SingleOrDefault(s => s.state.name == VRCAvatarConstants.IDLE_STATE_NAME); -#if VRC_SDK_VRCSDK3 public static CustomAnimLayer GetPlayableLayer(VRCAvatarDescriptor descripter, AnimLayerType layerType) => descripter.baseAnimationLayers .Where(l => l.type == layerType) @@ -124,5 +121,4 @@ public static AnimatorControllerLayer DetectCorrespondenceLayer(AnimatorControll .SingleOrDefault(); } } -#endif } diff --git a/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/AnimationsView3.cs b/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/AnimationsView3.cs index e336dcd..6f2ac3c 100644 --- a/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/AnimationsView3.cs +++ b/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/AnimationsView3.cs @@ -1,5 +1,4 @@ -#if VRC_SDK_VRCSDK3 -using System; +using System; using System.IO; using System.Linq; using UnityEditor; @@ -267,5 +266,4 @@ private static void SetNoBlink(AnimatorController fxController) } } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/FaceEmotionView3.cs b/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/FaceEmotionView3.cs index dea85cf..1963897 100644 --- a/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/FaceEmotionView3.cs +++ b/Packages/net.gatosyocora.vrcavatareditor/Editor/Views/FaceEmotionView3.cs @@ -1,5 +1,4 @@ -#if VRC_SDK_VRCSDK3 -using System.Linq; +using System.Linq; using UnityEditor; using UnityEditor.Animations; using UnityEngine; @@ -278,5 +277,4 @@ private void SetupForNoUseWriteDefaultIfNeeded(AnimatorController controller, VR } } } -} -#endif \ No newline at end of file +} \ No newline at end of file