Skip to content

Commit a349aa5

Browse files
authored
Merge branch 'develop' into isxb-1482/fix-custom-processor-serializesbyIndex
2 parents 34b0271 + 2315a74 commit a349aa5

File tree

5 files changed

+2
-12
lines changed

5 files changed

+2
-12
lines changed

Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,10 @@ internal unsafe interface IInputRuntime
187187
void SendAnalytic(InputAnalytics.IInputAnalytic analytic);
188188
#endif // UNITY_ANALYTICS || UNITY_EDITOR
189189

190-
bool isInBatchMode { get; }
191-
192190
#if UNITY_EDITOR
193191
Action<PlayModeStateChange> onPlayModeChanged { get; set; }
194192
Action onProjectChange { get; set; }
195193
bool isInPlayMode { get; }
196-
bool isPaused { get; }
197194
bool isEditorActive { get; }
198195

199196
// Functionality related to the Unity Remote.

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public bool runPlayerUpdatesInEditMode
362362

363363
private bool gameIsPlaying =>
364364
#if UNITY_EDITOR
365-
(m_Runtime.isInPlayMode && !m_Runtime.isPaused) || m_RunPlayerUpdatesInEditMode;
365+
(m_Runtime.isInPlayMode && !UnityEditor.EditorApplication.isPaused) || m_RunPlayerUpdatesInEditMode;
366366
#else
367367
true;
368368
#endif

Packages/com.unity.inputsystem/InputSystem/InputSystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3611,7 +3611,7 @@ private static void ShowRestartWarning()
36113611
{
36123612
if (!s_SystemObject.newInputBackendsCheckedAsEnabled &&
36133613
!EditorPlayerSettingHelpers.newSystemBackendsEnabled &&
3614-
!s_Manager.m_Runtime.isInBatchMode)
3614+
!Application.isBatchMode)
36153615
{
36163616
const string dialogText = "This project is using the new input system package but the native platform backends for the new input system are not enabled in the player settings. " +
36173617
"This means that no input from native devices will come through." +

Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,9 @@ public float scrollWheelDeltaPerTick
293293
get => NativeInputSystem.GetScrollWheelDeltaPerTick();
294294
}
295295
#endif
296-
297-
public bool isInBatchMode => Application.isBatchMode;
298-
299296
#if UNITY_EDITOR
300297

301298
public bool isInPlayMode => EditorApplication.isPlaying;
302-
public bool isPaused => EditorApplication.isPaused;
303299
public bool isEditorActive => InternalEditorUtility.isApplicationActive;
304300

305301
public Func<IntPtr, bool> onUnityRemoteMessage

Packages/com.unity.inputsystem/Tests/TestFixture/InputTestRuntime.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,8 @@ public double currentTimeOffsetToRealtimeSinceStartup
402402
}
403403
}
404404

405-
public bool isInBatchMode { get; set; }
406-
407405
#if UNITY_EDITOR
408406
public bool isInPlayMode { get; set; } = true;
409-
public bool isPaused { get; set; }
410407
public bool isEditorActive { get; set; } = true;
411408
public Func<IntPtr, bool> onUnityRemoteMessage
412409
{

0 commit comments

Comments
 (0)