Merge remote-tracking branch 'origin/master' into 1.6

2023-05-05 11:41:32 +02:00
parent 238526bdc4 de1ba2de6f
commit 22239bc2d1
15 changed files with 96 additions and 16 deletions
--- a/Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs
@@ -174,7 +174,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
                    continue;

                // Prevent from adding the same track twice
-                if (SubTracks.Any(x => x is IObjectTrack y && y.Object == script))
+                if (SubTracks.Any(x => x is IObjectTrack y && y.Object as SceneObject == script))
                    continue;

                var name = Utilities.Utils.GetPropertyNameUI(script.GetType().Name);