Skip to content

Commit 27358d4

Browse files
authored
FIX: Variable naming style for project-wide actions static instance. (#1778)
FIX: Variable naming style for project-wide actions static instance.
1 parent e8d0a68 commit 27358d4

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3011,7 +3011,7 @@ internal static bool ShouldDrawWarningIconForBinding(string bindingPath)
30113011

30123012
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
30133013

3014-
private static InputActionAsset s_projectWideActions;
3014+
private static InputActionAsset s_ProjectWideActions;
30153015
internal const string kProjectWideActionsAssetName = "ProjectWideInputActions";
30163016

30173017
/// <summary>
@@ -3028,31 +3028,31 @@ public static InputActionAsset actions
30283028
{
30293029
get
30303030
{
3031-
if (s_projectWideActions != null)
3032-
return s_projectWideActions;
3031+
if (s_ProjectWideActions != null)
3032+
return s_ProjectWideActions;
30333033

30343034
#if UNITY_EDITOR
3035-
s_projectWideActions = Editor.ProjectWideActionsAsset.GetOrCreate();
3035+
s_ProjectWideActions = ProjectWideActionsAsset.GetOrCreate();
30363036
#else
3037-
s_projectWideActions = Resources.FindObjectsOfTypeAll<InputActionAsset>().FirstOrDefault(o => o != null && o.name == kProjectWideActionsAssetName);
3037+
s_ProjectWideActions = Resources.FindObjectsOfTypeAll<InputActionAsset>().FirstOrDefault(o => o != null && o.name == kProjectWideActionsAssetName);
30383038
#endif
30393039

3040-
if (s_projectWideActions == null)
3040+
if (s_ProjectWideActions == null)
30413041
Debug.LogError($"Couldn't initialize project-wide input actions");
3042-
return s_projectWideActions;
3042+
return s_ProjectWideActions;
30433043
}
30443044

30453045
set
30463046
{
30473047
if (value == null)
30483048
throw new ArgumentNullException(nameof(value));
30493049

3050-
if (s_projectWideActions == value)
3050+
if (s_ProjectWideActions == value)
30513051
return;
30523052

3053-
s_projectWideActions?.Disable();
3054-
s_projectWideActions = value;
3055-
s_projectWideActions.Enable();
3053+
s_ProjectWideActions?.Disable();
3054+
s_ProjectWideActions = value;
3055+
s_ProjectWideActions.Enable();
30563056
}
30573057
}
30583058
#endif
@@ -3746,11 +3746,11 @@ private static void Reset(bool enableRemoting = false, IInputRuntime runtime = n
37463746

37473747
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
37483748
// Avoid touching the `actions` property directly here, to prevent unwanted initialisation.
3749-
if (s_projectWideActions)
3749+
if (s_ProjectWideActions)
37503750
{
3751-
s_projectWideActions.Disable();
3752-
s_projectWideActions?.OnSetupChanged(); // Cleanup ActionState (remove unused controls after disabling)
3753-
s_projectWideActions = null;
3751+
s_ProjectWideActions.Disable();
3752+
s_ProjectWideActions?.OnSetupChanged(); // Cleanup ActionState (remove unused controls after disabling)
3753+
s_ProjectWideActions = null;
37543754
}
37553755
#endif
37563756

0 commit comments

Comments
 (0)