Skip to content

UUM-134930: [2.10.x] Converted remaining references from instanceID to entityID. #1100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sim-bz merged 3 commits into from
Feb 23, 2026
Merged

UUM-134930: [2.10.x] Converted remaining references from instanceID to entityID. #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c79106
Upgraded remaining references to instanceID to entityID.
sim-bz Feb 23, 2026
2512dfc
Updated CHANGELOG and package version.
sim-bz Feb 23, 2026
80257ae
Merge branch 'release/2.10' into 2.10/uum-134930
sim-bz Feb 23, 2026
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
4 changes: 4 additions & 0 deletions com.unity.cinemachine/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 10 additions & 0 deletions com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion com.unity.cinemachine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" ],
Expand Down
Loading