Skip to content

Commit 594083e

Browse files
committed
Fix compilation errors for Unity 2018
1 parent 8eae0d1 commit 594083e

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Assets/Editor Toolbox/Editor/SceneView/ToolboxEditorSceneViewObjectSelector.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,16 @@ public static void Show(List<GameObject> gameObjects, Vector2 position)
4141

4242
private void OnEnable()
4343
{
44+
#if UNITY_2019_1_OR_NEWER
4445
UnityEditor.SceneView.duringSceneGui += OnSceneViewGui;
46+
#endif
4547
}
4648

4749
private void OnDisable()
4850
{
51+
#if UNITY_2019_1_OR_NEWER
4952
UnityEditor.SceneView.duringSceneGui -= OnSceneViewGui;
53+
#endif
5054
highlightedRenderers.Clear();
5155
highlightedObject = null;
5256
}
@@ -391,6 +395,7 @@ private void UpdateHighlightedRenderers()
391395
highlightedRenderers.AddRange(highlightedObject.GetComponentsInChildren<Renderer>(true));
392396
}
393397

398+
#if UNITY_2019_1_OR_NEWER
394399
private void OnSceneViewGui(UnityEditor.SceneView sceneView)
395400
{
396401
if (highlightedRenderers.Count == 0 ||
@@ -418,6 +423,7 @@ private void OnSceneViewGui(UnityEditor.SceneView sceneView)
418423
}
419424
#endif
420425
}
426+
#endif
421427

422428
private GameObject HighlightedObject
423429
{

Assets/Editor Toolbox/Editor/Utilities/PropertyUtility.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,11 @@ public static void OverrideLabelByValue(GUIContent label, SerializedProperty pro
428428
case SerializedPropertyType.ObjectReference:
429429
label.text = property.objectReferenceValue ? property.objectReferenceValue.ToString() : "null";
430430
break;
431+
#if UNITY_2019_3_OR_NEWER
431432
case SerializedPropertyType.ManagedReference:
432433
label.text = property.managedReferenceValue?.ToString() ?? "null";
433434
break;
435+
#endif
434436
case SerializedPropertyType.LayerMask:
435437
switch (property.intValue)
436438
{

0 commit comments

Comments
 (0)