From 9f555986e1fc6ccce24d86610e6953b1577f91d9 Mon Sep 17 00:00:00 2001 From: Lyuma Date: Wed, 15 Apr 2020 05:11:34 -0700 Subject: [PATCH] Unity 2018 and VRCSDK2 fix for iwsd_vrc Emu_Trigger. --- .../iwsd_vrc/Tools/OnEditorEmu/Scripts/Emu_Trigger.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/unity/DigAndAnnotate/Assets/iwsd_vrc/Tools/OnEditorEmu/Scripts/Emu_Trigger.cs b/unity/DigAndAnnotate/Assets/iwsd_vrc/Tools/OnEditorEmu/Scripts/Emu_Trigger.cs index d63420e..4fdebe3 100644 --- a/unity/DigAndAnnotate/Assets/iwsd_vrc/Tools/OnEditorEmu/Scripts/Emu_Trigger.cs +++ b/unity/DigAndAnnotate/Assets/iwsd_vrc/Tools/OnEditorEmu/Scripts/Emu_Trigger.cs @@ -18,7 +18,13 @@ class Val_Trigger internal Val_Trigger(VRCSDK2.VRC_Trigger vrcTrigger) { +#if UNITY_2018_4_OR_NEWER + // SDK2: The original VRC_Trigger is no longer destroyed, just disabled. + // So we can reference without a DeepCopy! + this.Triggers = vrcTrigger.Triggers; +#else this.Triggers = DeepCopyHelper.DeepCopy>(vrcTrigger.Triggers); +#endif } }