Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
3 changes: 2 additions & 1 deletion Packages/com.unity.inputsystem/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ however, it has to be formatted properly to pass verification tests.

## [Unreleased] - yyyy-mm-dd


### Fixed
- Fixed warnings being generated on Unity 6.3 (beta). (ISXB-1718).

## [1.15.0] - 2025-10-03

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
using UnityEngine.InputSystem.LowLevel;
using UnityEngine.InputSystem.Utilities;

// Suppress warnings from local variables for control references
// that we don't end up using.
// Suppress warnings from local variables for control references that we don't end up using.
#pragma warning disable CS0219

// Suppress warnings from obsolete code when references from auto-generated code from the same code base.
#pragma warning disable CS0618

namespace UnityEngine.InputSystem
{
internal partial class FastKeyboard : UnityEngine.InputSystem.Keyboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
using UnityEngine.InputSystem.LowLevel;
using UnityEngine.InputSystem.Utilities;

// Suppress warnings from local variables for control references
// that we don't end up using.
// Suppress warnings from local variables for control references that we don't end up using.
#pragma warning disable CS0219

// Suppress warnings from obsolete code when references from auto-generated code from the same code base.
#pragma warning disable CS0618

namespace UnityEngine.InputSystem
{
internal partial class FastMouse : UnityEngine.InputSystem.Mouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
using UnityEngine.InputSystem.LowLevel;
using UnityEngine.InputSystem.Utilities;

// Suppress warnings from local variables for control references
// that we don't end up using.
// Suppress warnings from local variables for control references that we don't end up using.
#pragma warning disable CS0219

// Suppress warnings from obsolete code when references from auto-generated code from the same code base.
#pragma warning disable CS0618

namespace UnityEngine.InputSystem
{
internal partial class FastTouchscreen : UnityEngine.InputSystem.Touchscreen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ static InputActionEditorWindow()
InputActionAssetEditor.RegisterType<InputActionEditorWindow>();
}

// Unity 6.4 changed signature of OpenAsset, and now it accepts entity id instead of instance id.
// Unity 6.3 changed signature of OpenAsset, and now it accepts entity id instead of instance id.
[OnOpenAsset]
#if UNITY_6000_4_OR_NEWER
#if UNITY_6000_3_OR_NEWER
public static bool OpenAsset(EntityId entityId, int line)
{
if (!InputActionImporter.IsInputActionAssetPath(AssetDatabase.GetAssetPath(entityId)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,12 @@ public static unsafe string GenerateCodeForDeviceLayout(string layoutName, strin
writer.WriteLine("using UnityEngine.InputSystem.LowLevel;");
writer.WriteLine("using UnityEngine.InputSystem.Utilities;");
writer.WriteLine("");
writer.WriteLine("// Suppress warnings from local variables for control references");
writer.WriteLine("// that we don't end up using.");
writer.WriteLine("// Suppress warnings from local variables for control references that we don't end up using.");
writer.WriteLine("#pragma warning disable CS0219");
writer.WriteLine("");
writer.WriteLine("// Suppress warnings from obsolete code when references from auto-generated code from the same code base.");
writer.WriteLine("#pragma warning disable CS0618");
writer.WriteLine("");
if (!string.IsNullOrEmpty(@namespace))
{
writer.WriteLine("namespace " + @namespace);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ static InputActionsEditorWindow()
m_Analytics ??= new InputActionsEditorSessionAnalytic(
InputActionsEditorSessionAnalytic.Data.Kind.EditorWindow);

// Unity 6.4 changed signature of OpenAsset, and now it accepts entity id instead of instance id.
// Unity 6.3 changed signature of OpenAsset, and now it accepts entity id instead of instance id.
[OnOpenAsset]
#if UNITY_6000_4_OR_NEWER
#if UNITY_6000_3_OR_NEWER
public static bool OpenAsset(EntityId entityId, int line)
{
if (!InputActionImporter.IsInputActionAssetPath(AssetDatabase.GetAssetPath(entityId)))
Expand Down
4 changes: 2 additions & 2 deletions Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3695,10 +3695,10 @@ internal static void OnPlayModeChange(PlayModeStateChange change)
}
}

// We have this function to hide away instanceId -> entityId migration that happened in Unity 6.4
// We have this function to hide away instanceId -> entityId migration that happened in Unity 6.3
public static bool HasNativeObject(Object obj)
{
#if UNITY_6000_4_OR_NEWER
#if UNITY_6000_3_OR_NEWER
return EditorUtility.EntityIdToObject(obj.GetEntityId()) != null;
#else
return EditorUtility.InstanceIDToObject(obj.GetInstanceID()) != null;
Expand Down