From be047526f60c1f3a6cf597032ff69d4a9c0fb3b4 Mon Sep 17 00:00:00 2001 From: sim-bz Date: Fri, 30 Jan 2026 13:39:17 -0500 Subject: [PATCH 1/4] Upgraded remaining references to instanceID to entityID. --- .../Editor/Utility/ScriptableObjectUtility.cs | 21 ++++++++++++++++++- .../Editor/Windows/CinemachineSettings.cs | 4 ++++ .../Behaviours/CinemachineStoryboard.cs | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs b/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs index 0f42b8aa0..7c172ef04 100644 --- a/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs +++ b/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs @@ -25,6 +25,18 @@ public static ScriptableObject CreateAt(Type assetType, string assetPath) return asset; } +#if UNITY_6000_3_OR_NEWER + class CreateAssetAction : UnityEditor.ProjectWindowCallback.AssetCreationEndAction + { + public Type TypeToCreate; + public override void Action(EntityId entityId, string pathName, string resourceFile) + { + var asset = CreateAt(TypeToCreate, pathName); + if (asset != null) + ProjectWindowUtil.ShowCreatedAsset(asset); + } + } +#else class CreateAssetAction : UnityEditor.ProjectWindowCallback.EndNameEditAction { public Type TypeToCreate; @@ -35,6 +47,7 @@ public override void Action(int instanceId, string pathName, string resourceFile ProjectWindowUtil.ShowCreatedAsset(asset); } } +#endif /// /// Creates a new asset of the specified type in the Unity project. @@ -52,7 +65,13 @@ public static void Create(string defaultName = null) where T : ScriptableObje var action = ScriptableObject.CreateInstance(); action.TypeToCreate = typeof(T); var icon = EditorGUIUtility.IconContent("ScriptableObject Icon").image as Texture2D; - ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, action, $"{defaultName}.asset", icon , null); + +#if UNITY_6000_3_OR_NEWER + var entityId = EntityId.None; +#else + var entityId = 0; +#endif + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(entityId, action, $"{defaultName}.asset", icon , null); } } } diff --git a/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs b/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs index 861109abc..2285a883c 100644 --- a/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs +++ b/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs @@ -117,7 +117,11 @@ static void OnPostprocessAllAssets( string[] movedFromAssetPaths, bool didDomainReload) { if (didDomainReload) +#if UNITY_6000_3_OR_NEWER + EditorApplication.hierarchyWindowItemByEntityIdOnGUI += (instanceID, r) => +#else EditorApplication.hierarchyWindowItemOnGUI += (instanceID, r) => +#endif { #if UNITY_6000_3_OR_NEWER var instance = EditorUtility.EntityIdToObject(instanceID) as GameObject; diff --git a/com.unity.cinemachine/Runtime/Behaviours/CinemachineStoryboard.cs b/com.unity.cinemachine/Runtime/Behaviours/CinemachineStoryboard.cs index e3cfb1012..5728eff63 100644 --- a/com.unity.cinemachine/Runtime/Behaviours/CinemachineStoryboard.cs +++ b/com.unity.cinemachine/Runtime/Behaviours/CinemachineStoryboard.cs @@ -201,7 +201,11 @@ protected override void ConnectToVcam(bool connect) DestroyCanvas(); } +#if UNITY_6000_3_OR_NEWER + string CanvasName => "_CM_canvas" + gameObject.GetEntityId(); +#else string CanvasName => "_CM_canvas" + gameObject.GetInstanceID(); +#endif void CameraUpdatedCallback(CinemachineBrain brain) { From 6f5fff2f0dab2a0f3d8e3a0b41311531b1131a4f Mon Sep 17 00:00:00 2001 From: sim-bz Date: Fri, 30 Jan 2026 13:47:40 -0500 Subject: [PATCH 2/4] Updated CHANGELOG. --- com.unity.cinemachine/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/com.unity.cinemachine/CHANGELOG.md b/com.unity.cinemachine/CHANGELOG.md index 59d759ab1..ff3a20d57 100644 --- a/com.unity.cinemachine/CHANGELOG.md +++ b/com.unity.cinemachine/CHANGELOG.md @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed error when both HDRP and URP rendering pipelines are added to a project.\ - Fixed outdated warning on RotationComposerComponent. +### Changed +- Converted code using InstanceID references and API to EntityID. + ## [3.1.5] - 2025-10-21 ### Bugfixes From 9a75c18bf638c39e4a4867b50d6dfa42cb123c42 Mon Sep 17 00:00:00 2001 From: sim-bz Date: Fri, 30 Jan 2026 14:21:10 -0500 Subject: [PATCH 3/4] Fixed compatibility with 6.3 --- com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs b/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs index 7c172ef04..41384910d 100644 --- a/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs +++ b/com.unity.cinemachine/Editor/Utility/ScriptableObjectUtility.cs @@ -25,7 +25,7 @@ public static ScriptableObject CreateAt(Type assetType, string assetPath) return asset; } -#if UNITY_6000_3_OR_NEWER +#if UNITY_6000_4_OR_NEWER class CreateAssetAction : UnityEditor.ProjectWindowCallback.AssetCreationEndAction { public Type TypeToCreate; From 93b43901f5641ac19a272674d18087f2c05788d4 Mon Sep 17 00:00:00 2001 From: sim-bz Date: Fri, 30 Jan 2026 15:02:58 -0500 Subject: [PATCH 4/4] Fixed compilation on 6.3. --- com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs b/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs index 2285a883c..a0a9e0ca7 100644 --- a/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs +++ b/com.unity.cinemachine/Editor/Windows/CinemachineSettings.cs @@ -117,7 +117,7 @@ static void OnPostprocessAllAssets( string[] movedFromAssetPaths, bool didDomainReload) { if (didDomainReload) -#if UNITY_6000_3_OR_NEWER +#if UNITY_6000_4_OR_NEWER EditorApplication.hierarchyWindowItemByEntityIdOnGUI += (instanceID, r) => #else EditorApplication.hierarchyWindowItemOnGUI += (instanceID, r) =>