Merge pull request Kellojo#15 from GameArki/master

<feature> Smoothly Moving Brush; <bugfix> ctrl+z bug
GameArki · Sep 24, 2023 · fd8352e · fd8352e
2 parents 041fa7f + ee8409b
commit fd8352e
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/Assets/GameObjectBrush/Scripts/Editor/GameObjectBrushEditor.cs b/Assets/GameObjectBrush/Scripts/Editor/GameObjectBrushEditor.cs
@@ -64,15 +64,24 @@ void OnEnable() {
             brushes = lastUsedBCollInfo.Value;
 
             //add thene delegate
+#if UNITY_2021_1_OR_NEWER
+            SceneView.duringSceneGui += OnSceneGUI;
+#else
             SceneView.onSceneGUIDelegate += OnSceneGUI;
+#endif
             Instance = this;
             this.autoRepaintOnSceneChange = true;
         }
         void OnDestroy() {
             if (brushes != null) {
                 brushes.Save();
             }
+            //remove the delegate
+#if UNITY_2021_1_OR_NEWER
+            SceneView.duringSceneGui -= OnSceneGUI;
+#else
             SceneView.onSceneGUIDelegate -= OnSceneGUI;
+#endif
         }
         void OnGUI() {
 
@@ -403,6 +412,7 @@ void OnSceneGUI(SceneView sceneView) {
                     }
                 }
             }
+            sceneView.Repaint();
         }
 
 
@@ -654,8 +664,10 @@ public static GameObject[] GetAllChildren(GameObject obj) {
         public static bool arePositionsWithinRange(Dictionary<GameObject, Vector3> positions, Vector3 point, float range, float density) {
             var values = positions.Values;
             float adjustedRange = (float) range / density;
-            foreach(Vector3 position in values) {
-                if (Vector3.Distance(position, point) <= adjustedRange) {
+            foreach(var kv in positions) {
+                var go = kv.Key;
+                var position = kv.Value;
+                if (go != null && Vector3.Distance(position, point) <= adjustedRange) {
                     return true;
                 }
             }