diff --git a/com.unity.cinemachine/CHANGELOG.md b/com.unity.cinemachine/CHANGELOG.md index 825c3cbed..fb5b22a5c 100644 --- a/com.unity.cinemachine/CHANGELOG.md +++ b/com.unity.cinemachine/CHANGELOG.md @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.10.6] - 2026-02-23 + +- Converted code using InstanceID references and API to EntityID. + ## [2.10.4] - 2025-06-10 - Bugfix: FramingTransposer with a dead zone would sometimes drift. diff --git a/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs b/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs index 6034e3206..6df2ea18f 100644 --- a/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs +++ b/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs @@ -22,7 +22,11 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse { if (didDomainReload) { +#if UNITY_6000_4_OR_NEWER + EditorApplication.hierarchyWindowItemByEntityIdOnGUI += OnHierarchyGUI; +#else EditorApplication.hierarchyWindowItemOnGUI += OnHierarchyGUI; +#endif } } #endif @@ -511,9 +515,15 @@ private static void OnGUI() GUILayout.EndScrollView(); } +#if UNITY_6000_4_OR_NEWER + private static void OnHierarchyGUI(EntityId entityId, Rect selectionRect) + { + GameObject instance = EditorUtility.EntityIdToObject(entityId) as GameObject; +#else private static void OnHierarchyGUI(int instanceID, Rect selectionRect) { GameObject instance = EditorUtility.InstanceIDToObject(instanceID) as GameObject; +#endif if (instance == null) { // Object in process of being deleted? diff --git a/com.unity.cinemachine/package.json b/com.unity.cinemachine/package.json index fe3562b16..490f4bad8 100644 --- a/com.unity.cinemachine/package.json +++ b/com.unity.cinemachine/package.json @@ -1,7 +1,7 @@ { "name": "com.unity.cinemachine", "displayName": "Cinemachine", - "version": "2.10.4", + "version": "2.10.6", "unity": "2022.3", "description": "Smart camera tools for passionate creators. \n\n--- ATTENTION ---\nUpgrading a project from Cinemachine 2.x to Cinemachine 3.x is not automatic and not trivial.\nDon't do it unless you're willing to put in the required effort.\n\n> For more details, refer to the upgrade guide:\nhttps://docs.unity3d.com/Packages/com.unity.cinemachine@3.1/manual/CinemachineUpgradeFrom2.html\n--------------------\n\n\n", "keywords": [ "camera", "follow", "rig", "fps", "cinematography", "aim", "orbit", "cutscene", "cinematic", "collision", "freelook", "cinemachine", "compose", "composition", "dolly", "track", "clearshot", "noise", "framing", "handheld", "lens", "impulse" ],