Fix usage of obsolete EditMode.DoEditModeInspectorModeButton overload.

Unity-Technologies · Dec 27, 2017 · dc146ec · dc146ec
1 parent f819310
commit dc146ec
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 30 deletions.
diff --git a/Assets/NavMeshComponents/Editor/NavMeshModifierVolumeEditor.cs b/Assets/NavMeshComponents/Editor/NavMeshModifierVolumeEditor.cs
@@ -39,11 +39,18 @@ void OnDisable()
             NavMeshVisualizationSettings.showNavigation--;
         }
 
+        Bounds GetBounds()
+        {
+            var navModifier = (NavMeshModifierVolume)target;
+            return new Bounds(navModifier.transform.position, navModifier.size);
+        }
+
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
 
-            InspectorEditButtonGUI();
+            EditMode.DoEditModeInspectorModeButton(EditMode.SceneViewEditMode.Collider, "Edit Volume",
+                EditorGUIUtility.IconContent("EditCollider"), GetBounds, this);
 
             EditorGUILayout.PropertyField(m_Size);
             EditorGUILayout.PropertyField(m_Center);
@@ -99,20 +106,6 @@ static void RenderBoxGizmoNotSelected(NavMeshModifierVolume navModifier, GizmoTy
             Gizmos.DrawIcon(navModifier.transform.position, "NavMeshModifierVolume Icon", true);
         }
 
-        void InspectorEditButtonGUI()
-        {
-            var navModifier = (NavMeshModifierVolume)target;
-            var bounds = new Bounds(navModifier.transform.position, navModifier.size);
-
-            EditMode.DoEditModeInspectorModeButton(
-                EditMode.SceneViewEditMode.Collider,
-                "Edit Volume",
-                EditorGUIUtility.IconContent("EditCollider"),
-                bounds,
-                this
-                );
-        }
-
         void OnSceneGUI()
         {
             if (!editingCollider)

diff --git a/Assets/NavMeshComponents/Editor/NavMeshSurfaceEditor.cs b/Assets/NavMeshComponents/Editor/NavMeshSurfaceEditor.cs
@@ -135,6 +135,12 @@ void ClearSurface(NavMeshSurface navSurface)
             }
         }
 
+        Bounds GetBounds()
+        {
+            var navSurface = (NavMeshSurface)target;
+            return new Bounds(navSurface.transform.position, navSurface.size);
+        }
+
         public override void OnInspectorGUI()
         {
             if (s_Styles == null)
@@ -159,9 +165,13 @@ public override void OnInspectorGUI()
             if ((CollectObjects)m_CollectObjects.enumValueIndex == CollectObjects.Volume)
             {
                 EditorGUI.indentLevel++;
-                InspectorEditButtonGUI();
+
+                EditMode.DoEditModeInspectorModeButton(EditMode.SceneViewEditMode.Collider, "Edit Volume",
+                    EditorGUIUtility.IconContent("EditCollider"), GetBounds, this);
                 EditorGUILayout.PropertyField(m_Size);
                 EditorGUILayout.PropertyField(m_Center);
+
+                EditorGUI.indentLevel--;
             }
             else
             {
@@ -434,20 +444,6 @@ static void RenderBoxGizmo(NavMeshSurface navSurface, GizmoType gizmoType, bool
             Gizmos.DrawIcon(navSurface.transform.position, "NavMeshSurface Icon", true);
         }
 
-        void InspectorEditButtonGUI()
-        {
-            var navSurface = (NavMeshSurface)target;
-            var bounds = new Bounds(navSurface.transform.position, navSurface.size);
-
-            EditMode.DoEditModeInspectorModeButton(
-                EditMode.SceneViewEditMode.Collider,
-                "Edit Volume",
-                EditorGUIUtility.IconContent("EditCollider"),
-                bounds,
-                this
-                );
-        }
-
         void OnSceneGUI()
         {
             if (!editingCollider)