Skip to content

Commit 26fbb4c

Browse files
committed
Fix usage of obsolete EditMode.DoEditModeInspectorModeButton overload.
1 parent 0b616e6 commit 26fbb4c

File tree

2 files changed

+19
-30
lines changed

2 files changed

+19
-30
lines changed

Assets/NavMeshComponents/Editor/NavMeshModifierVolumeEditor.cs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,18 @@ void OnDisable()
3939
NavMeshVisualizationSettings.showNavigation--;
4040
}
4141

42+
Bounds GetBounds()
43+
{
44+
var navModifier = (NavMeshModifierVolume)target;
45+
return new Bounds(navModifier.transform.position, navModifier.size);
46+
}
47+
4248
public override void OnInspectorGUI()
4349
{
4450
serializedObject.Update();
4551

46-
InspectorEditButtonGUI();
52+
EditMode.DoEditModeInspectorModeButton(EditMode.SceneViewEditMode.Collider, "Edit Volume",
53+
EditorGUIUtility.IconContent("EditCollider"), GetBounds, this);
4754

4855
EditorGUILayout.PropertyField(m_Size);
4956
EditorGUILayout.PropertyField(m_Center);
@@ -99,20 +106,6 @@ static void RenderBoxGizmoNotSelected(NavMeshModifierVolume navModifier, GizmoTy
99106
Gizmos.DrawIcon(navModifier.transform.position, "NavMeshModifierVolume Icon", true);
100107
}
101108

102-
void InspectorEditButtonGUI()
103-
{
104-
var navModifier = (NavMeshModifierVolume)target;
105-
var bounds = new Bounds(navModifier.transform.position, navModifier.size);
106-
107-
EditMode.DoEditModeInspectorModeButton(
108-
EditMode.SceneViewEditMode.Collider,
109-
"Edit Volume",
110-
EditorGUIUtility.IconContent("EditCollider"),
111-
bounds,
112-
this
113-
);
114-
}
115-
116109
void OnSceneGUI()
117110
{
118111
if (!editingCollider)

Assets/NavMeshComponents/Editor/NavMeshSurfaceEditor.cs

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ void ClearSurface(NavMeshSurface navSurface)
135135
}
136136
}
137137

138+
Bounds GetBounds()
139+
{
140+
var navSurface = (NavMeshSurface)target;
141+
return new Bounds(navSurface.transform.position, navSurface.size);
142+
}
143+
138144
public override void OnInspectorGUI()
139145
{
140146
if (s_Styles == null)
@@ -159,9 +165,13 @@ public override void OnInspectorGUI()
159165
if ((CollectObjects)m_CollectObjects.enumValueIndex == CollectObjects.Volume)
160166
{
161167
EditorGUI.indentLevel++;
162-
InspectorEditButtonGUI();
168+
169+
EditMode.DoEditModeInspectorModeButton(EditMode.SceneViewEditMode.Collider, "Edit Volume",
170+
EditorGUIUtility.IconContent("EditCollider"), GetBounds, this);
163171
EditorGUILayout.PropertyField(m_Size);
164172
EditorGUILayout.PropertyField(m_Center);
173+
174+
EditorGUI.indentLevel--;
165175
}
166176
else
167177
{
@@ -434,20 +444,6 @@ static void RenderBoxGizmo(NavMeshSurface navSurface, GizmoType gizmoType, bool
434444
Gizmos.DrawIcon(navSurface.transform.position, "NavMeshSurface Icon", true);
435445
}
436446

437-
void InspectorEditButtonGUI()
438-
{
439-
var navSurface = (NavMeshSurface)target;
440-
var bounds = new Bounds(navSurface.transform.position, navSurface.size);
441-
442-
EditMode.DoEditModeInspectorModeButton(
443-
EditMode.SceneViewEditMode.Collider,
444-
"Edit Volume",
445-
EditorGUIUtility.IconContent("EditCollider"),
446-
bounds,
447-
this
448-
);
449-
}
450-
451447
void OnSceneGUI()
452448
{
453449
if (!editingCollider)

0 commit comments

Comments
 (0)