Merge branch 'inspector-memory-leak-fix' into develop

arcadia-unity · Sep 16, 2019 · 2028e7d · 2028e7d
2 parents 8254384 + 6e27845
commit 2028e7d
Show file tree

Hide file tree

Showing 166 changed files with 335 additions and 824 deletions.
diff --git a/Components/ArcadiaBehaviour.cs b/Components/ArcadiaBehaviour.cs
@@ -1,5 +1,4 @@
-#if NET_4_6
-using UnityEngine;
+using UnityEngine;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -561,5 +560,4 @@ public void RunFunctions (object arg1, object arg2, object arg3)
 		}
 	}
 
-}
-#endif
+}
diff --git a/Components/ArcadiaState.cs b/Components/ArcadiaState.cs
@@ -1,5 +1,4 @@
-#if NET_4_6
-using UnityEngine;
+using UnityEngine;
 using System.Collections.Generic;
 using clojure.lang;
 using Arcadia;
@@ -285,5 +284,4 @@ public void CopyTo (ArcadiaState target)
 		target.conversions = conversions;
 	}
 
-}
-#endif
+}
diff --git a/Components/AwakeHook.cs b/Components/AwakeHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class AwakeHook : ArcadiaBehaviour
@@ -9,5 +9,4 @@ public override void Awake()
       base.Awake();
       RunFunctions();
   }
-}
-#endif
+}
diff --git a/Components/AwakeHook.cs.meta b/Components/AwakeHook.cs.meta
diff --git a/Components/FixedUpdateHook.cs b/Components/FixedUpdateHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class FixedUpdateHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void FixedUpdate()
   {
       RunFunctions();
   }
-}
-#endif
+}
diff --git a/Components/FixedUpdateHook.cs.meta b/Components/FixedUpdateHook.cs.meta
diff --git a/Components/LateUpdateHook.cs b/Components/LateUpdateHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class LateUpdateHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void LateUpdate()
   {
       RunFunctions();
   }
-}
-#endif
+}
diff --git a/Components/LateUpdateHook.cs.meta b/Components/LateUpdateHook.cs.meta
diff --git a/Components/OnAnimatorIKHook.cs b/Components/OnAnimatorIKHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnAnimatorIKHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnAnimatorIK(System.Int32 a)
   {
       RunFunctions(a);
   }
-}
-#endif
+}
diff --git a/Components/OnAnimatorIKHook.cs.meta b/Components/OnAnimatorIKHook.cs.meta
diff --git a/Components/OnAnimatorMoveHook.cs b/Components/OnAnimatorMoveHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnAnimatorMoveHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnAnimatorMove()
   {
       RunFunctions();
   }
-}
-#endif
+}
diff --git a/Components/OnAnimatorMoveHook.cs.meta b/Components/OnAnimatorMoveHook.cs.meta
diff --git a/Components/OnApplicationFocusHook.cs b/Components/OnApplicationFocusHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnApplicationFocusHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnApplicationFocus(System.Boolean a)
   {
       RunFunctions(a);
   }
-}
-#endif
+}
diff --git a/Components/OnApplicationFocusHook.cs.meta b/Components/OnApplicationFocusHook.cs.meta
diff --git a/Components/OnApplicationPauseHook.cs b/Components/OnApplicationPauseHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnApplicationPauseHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnApplicationPause(System.Boolean a)
   {
       RunFunctions(a);
   }
-}
-#endif
+}
diff --git a/Components/OnApplicationPauseHook.cs.meta b/Components/OnApplicationPauseHook.cs.meta
diff --git a/Components/OnApplicationQuitHook.cs b/Components/OnApplicationQuitHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnApplicationQuitHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnApplicationQuit()
   {
       RunFunctions();
   }
-}
-#endif
+}
diff --git a/Components/OnApplicationQuitHook.cs.meta b/Components/OnApplicationQuitHook.cs.meta
diff --git a/Components/OnAudioFilterReadHook.cs b/Components/OnAudioFilterReadHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnAudioFilterReadHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnAudioFilterRead(System.Single[] a, System.Int32 b)
   {
       RunFunctions(a, b);
   }
-}
-#endif
+}
diff --git a/Components/OnAudioFilterReadHook.cs.meta b/Components/OnAudioFilterReadHook.cs.meta
diff --git a/Components/OnBecameInvisibleHook.cs b/Components/OnBecameInvisibleHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnBecameInvisibleHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnBecameInvisible()
   {
       RunFunctions();
   }
-}
-#endif
+}
diff --git a/Components/OnBecameInvisibleHook.cs.meta b/Components/OnBecameInvisibleHook.cs.meta
diff --git a/Components/OnBecameVisibleHook.cs b/Components/OnBecameVisibleHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnBecameVisibleHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnBecameVisible()
   {
       RunFunctions();
   }
-}
-#endif
+}
diff --git a/Components/OnBecameVisibleHook.cs.meta b/Components/OnBecameVisibleHook.cs.meta
diff --git a/Components/OnBeginDragHook.cs b/Components/OnBeginDragHook.cs
@@ -1,13 +1,11 @@
-#if NET_4_6
 using UnityEngine;
 using UnityEngine.EventSystems;
 using clojure.lang;
 
-public class OnBeginDragHook : ArcadiaBehaviour, IBeginDragHandler
+public class OnBeginDragHook : ArcadiaBehaviour
 {
   public void OnBeginDrag(PointerEventData a)
   {
       RunFunctions(a);
   }
-}
-#endif
+}
diff --git a/Components/OnBeginDragHook.cs.meta b/Components/OnBeginDragHook.cs.meta
diff --git a/Components/OnCancelHook.cs b/Components/OnCancelHook.cs
@@ -1,13 +1,11 @@
-#if NET_4_6
 using UnityEngine;
 using UnityEngine.EventSystems;
 using clojure.lang;
 
-public class OnCancelHook : ArcadiaBehaviour, ICancelHandler
+public class OnCancelHook : ArcadiaBehaviour
 {
   public void OnCancel(BaseEventData a)
   {
       RunFunctions(a);
   }
-}
-#endif
+}
diff --git a/Components/OnCancelHook.cs.meta b/Components/OnCancelHook.cs.meta
diff --git a/Components/OnCollisionEnter2DHook.cs b/Components/OnCollisionEnter2DHook.cs
@@ -1,5 +1,5 @@
-#if NET_4_6
 using UnityEngine;
+using UnityEngine.EventSystems;
 using clojure.lang;
 
 public class OnCollisionEnter2DHook : ArcadiaBehaviour
@@ -8,5 +8,4 @@ public void OnCollisionEnter2D(UnityEngine.Collision2D a)
   {
       RunFunctions(a);
   }
-}
-#endif
+}
diff --git a/Components/OnCollisionEnter2DHook.cs.meta b/Components/OnCollisionEnter2DHook.cs.meta