From 93adbfd85d2bd91310118ec57c190873b5a7e919 Mon Sep 17 00:00:00 2001 From: bd_ Date: Mon, 25 Sep 2023 22:56:21 +0900 Subject: [PATCH] fix: compile error in build --- .../Runtime/ArmatureAwase/ArmatureLockController.cs | 2 ++ .../Runtime/ArmatureAwase/TransformState.cs | 4 ++++ .../Runtime/MAMoveIndependently.cs | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/ArmatureLockController.cs b/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/ArmatureLockController.cs index b6593894..2d1a7e01 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/ArmatureLockController.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/ArmatureLockController.cs @@ -74,7 +74,9 @@ namespace nadena.dev.modular_avatar.core.armature_lock public ArmatureLockController(ModularAvatarMergeArmature mama, GetTransformsDelegate getTransforms) { +#if UNITY_EDITOR AssemblyReloadEvents.beforeAssemblyReload += Dispose; +#endif this._mama = mama; this._getTransforms = getTransforms; diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/TransformState.cs b/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/TransformState.cs index 18cad3be..815fe96d 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/TransformState.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/TransformState.cs @@ -1,6 +1,8 @@ using System.Runtime.CompilerServices; using Unity.Burst; +#if UNITY_EDITOR using UnityEditor; +#endif using UnityEngine; namespace nadena.dev.modular_avatar.core.armature_lock @@ -27,7 +29,9 @@ namespace nadena.dev.modular_avatar.core.armature_lock public void ToTransform(Transform bone) { +#if UNITY_EDITOR Undo.RecordObject(bone, Undo.GetCurrentGroupName()); +#endif bone.localPosition = localPosition; bone.localRotation = localRotation; bone.localScale = localScale; diff --git a/Packages/nadena.dev.modular-avatar/Runtime/MAMoveIndependently.cs b/Packages/nadena.dev.modular-avatar/Runtime/MAMoveIndependently.cs index 003c794e..227d5c89 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/MAMoveIndependently.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/MAMoveIndependently.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +#if UNITY_EDITOR using UnityEditor; +#endif using UnityEngine; using VRC.SDKBase; @@ -121,9 +123,9 @@ namespace nadena.dev.modular_avatar.core.ArmatureAwase if (deltaPos.sqrMagnitude < EPSILON && deltaRot < EPSILON && deltaScale < EPSILON) { Matrix4x4 childNewLocal = parent.worldToLocalMatrix * state.childWorld; - +#if UNITY_EDITOR Undo.RecordObject(child, Undo.GetCurrentGroupName()); - +#endif child.localPosition = childNewLocal.MultiplyPoint(Vector3.zero); child.localRotation = childNewLocal.rotation; child.localScale = childNewLocal.lossyScale;