🐛 Fix for Udon

esnya · Jan 20, 2021 · c018796 · c018796
1 parent 36f679f
commit c018796
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Assets/EsnyaUnityTools/AnimGenerator/Editor/Generators/SimpleToggleLayerGenerator.cs b/Assets/EsnyaUnityTools/AnimGenerator/Editor/Generators/SimpleToggleLayerGenerator.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.Experimental.UIElements;
 
-#if VRC_SDK_VRCSDK3
+#if VRC_SDK_VRCSDK3 && !UDON
 using VRC.SDK3.Avatars.Components;
 using VRC.SDK3.Avatars.ScriptableObjects;
 #endif
@@ -21,7 +21,7 @@ public class SimpleToggleLayerGenerator : LayerGenerator.Generator
         public Motion falseMotion;
         public float duration = 0.25f;
 
-#if VRC_SDK_VRCSDK3
+#if VRC_SDK_VRCSDK3 && !UDON
         public VRCAvatarDescriptor avatarDescriptor;
         public bool installExpressionsMenu;
         public string menuName;
@@ -77,7 +77,7 @@ static AnimatorStateTransition MakeAnimatorStateTransition(AnimatorState animato
 
             return animatorStateTransition;
         }
-#if VRC_SDK_VRCSDK3
+#if VRC_SDK_VRCSDK3 && !UDON
         static VRCExpressionParameters MakeExpressionParameters(VRCAvatarDescriptor avatarDescriptor, ref List<Object> objects)
         {
             EditorUtility.SetDirty(avatarDescriptor);
@@ -150,7 +150,7 @@ public override IEnumerable<Object> Generate(AnimatorController animatorControll
             ExAnimatorUtility.ClearStateMachine(stateMachine);
 
             var objects = new List<Object>();
-#if VRC_SDK_VRCSDK3
+#if VRC_SDK_VRCSDK3 && !UDON
             if (installExpressionsMenu) {
                 var expressionParameters = MakeExpressionParameters(avatarDescriptor, ref objects);
                 var expressionParameter = MakeExpressionParameter(expressionParameters, parameter);

diff --git a/Assets/EsnyaUnityTools/AnimGenerator/Editor/Utilites/ExAnimatorUtility.cs b/Assets/EsnyaUnityTools/AnimGenerator/Editor/Utilites/ExAnimatorUtility.cs
@@ -5,15 +5,15 @@
 using UnityEditor.Animations;
 using UnityEngine;
 
-#if VRC_SDK_VRCSDK3
+#if VRC_SDK_VRCSDK3 && !UDON
 using VRC.SDK3.Avatars.Components;
 #endif
 
 namespace EsnyaFactory
 {
     public class ExAnimatorUtility
     {
-#if VRC_SDK_VRCSDK3
+#if VRC_SDK_VRCSDK3 && !UDON
         public static RuntimeAnimatorController GetOrCreatePlayableLayer(VRCAvatarDescriptor avatarDescriptor, VRCAvatarDescriptor.AnimLayerType type, RuntimeAnimatorController template)
         {
             avatarDescriptor.customizeAnimationLayers = true;