Skip to content

Commit 37c0771

Browse files
authored
Merge branch 'develop' into update-mouse-visualizer
2 parents 9f92a02 + 7735517 commit 37c0771

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ however, it has to be formatted properly to pass verification tests.
1616
- Fixed Action Maps contextual menu in Action Editor UI that occasionally displays unrelated items.
1717
- Fixed "MissingReferenceException" errors when closing an in-game dropdown field [ISXB-1081](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1081).
1818
- Fixed potential crash on Mac when using stale references to deleted InputDevice objects [ISXB-606](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-606).
19+
- Fixed conditional compilation for non-editor analytics on platforms not enabling analytics.
1920

2021
### Changed
2122
- Renamed editor Resources directories to PackageResources to fix package validation warnings.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ public Action onProjectChange
393393

394394
public void SendAnalytic(InputAnalytics.IInputAnalytic analytic)
395395
{
396-
#if ENABLE_CLOUD_SERVICES_ANALYTICS
397396
#if (UNITY_EDITOR)
398397
#if (UNITY_2023_2_OR_NEWER)
399398
EditorAnalytics.SendAnalytic(analytic);
@@ -405,15 +404,14 @@ public void SendAnalytic(InputAnalytics.IInputAnalytic analytic)
405404
EditorAnalytics.SendEventWithLimit(info.Name, analytic);
406405
#endif // UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS || UNITY_2023_1_OR_NEWER
407406
#endif // UNITY_2023_2_OR_NEWER
408-
#elif (UNITY_ANALYTICS) // Implicitly: !UNITY_EDITOR
407+
#elif (ENABLE_CLOUD_SERVICES_ANALYTICS) // Implicitly: !UNITY_EDITOR && UNITY_ANALYTICS
409408
var info = analytic.info;
410409
Analytics.Analytics.RegisterEvent(info.Name, info.MaxEventsPerHour, info.MaxNumberOfElements, InputAnalytics.kVendorKey);
411410
if (analytic.TryGatherData(out var data, out var error))
412411
Analytics.Analytics.SendEvent(info.Name, data);
413412
else
414413
Debug.Log(error); // Non fatal
415414
#endif //UNITY_EDITOR
416-
#endif //ENABLE_CLOUD_SERVICES_ANALYTICS
417415
}
418416

419417
#endif // UNITY_ANALYTICS || UNITY_EDITOR

0 commit comments

Comments
 (0)