Skip to content

fix: Fixed compile error in 2022.2 #2214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JesseOlmer merged 3 commits into from
Sep 23, 2022
Merged

fix: Fixed compile error in 2022.2 #2214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58dfea8
Fix compile error in 2022.2+
ShadauxCat Sep 22, 2022
cfa9739
Missed one
ShadauxCat Sep 22, 2022
5617bea
Merge branch 'develop' into fix/compile_error_2022.2
ShadauxCat Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using Unity.Netcode.Components;
#if UNITY_UNET_PRESENT
using Unity.Netcode.Transports.UNET;
#endif
using Unity.Netcode.Transports.UTP;
using UnityEditor;

Expand All @@ -20,7 +22,7 @@ public override void OnInspectorGUI()
EditorGUI.EndChangeCheck();
}
}

#if UNITY_UNET_PRESENT
/// <summary>
/// Internal use. Hides the script field for UNetTransport.
/// </summary>
Expand All @@ -29,6 +31,7 @@ public class UNetTransportEditor : HiddenScriptEditor
{

}
#endif

/// <summary>
/// Internal use. Hides the script field for UnityTransport.
Expand Down
5 changes: 5 additions & 0 deletions com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
"expression": "",
"define": "MULTIPLAYER_TOOLS"
},
{
"name": "Unity",
"expression": "(0,2022.2.0a5)",
"define": "UNITY_UNET_PRESENT"
},
{
"name": "com.unity.modules.animation",
"expression": "",
Expand Down