diff --git a/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs b/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs index 733664411..2a5b1554c 100644 --- a/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/ParticleEmitterTrack.cs @@ -68,6 +68,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks var e = (ParticleEmitterTrack)track; Guid id = new Guid(stream.ReadBytes(16)); e.Asset = FlaxEngine.Content.LoadAsync(id); + stream.ReadInt32(); // Skip emitterIndex var m = e.TrackMedia; m.StartFrame = stream.ReadInt32(); m.DurationFrames = stream.ReadInt32(); diff --git a/Source/Editor/Options/OptionsModule.cs b/Source/Editor/Options/OptionsModule.cs index fac8a4a78..62496823c 100644 --- a/Source/Editor/Options/OptionsModule.cs +++ b/Source/Editor/Options/OptionsModule.cs @@ -229,6 +229,7 @@ namespace FlaxEditor.Options BorderNormal = Color.FromBgra(0xFF54545C), TextBoxBackground = Color.FromBgra(0xFF333337), TextBoxBackgroundSelected = Color.FromBgra(0xFF3F3F46), + ProgressNormal = Color.FromBgra(0xFF0ad328), // Fonts FontTitle = options.Interface.TitleFont.GetFont(), @@ -247,12 +248,11 @@ namespace FlaxEditor.Options StatusBarSizeGrip = Editor.Icons.StatusBarSizeGrip12, Translate = Editor.Icons.Translate16, Rotate = Editor.Icons.Rotate16, - Scale = Editor.Icons.Scale16 + Scale = Editor.Icons.Scale16, + + SharedTooltip = new Tooltip() }; style.DragWindow = style.BackgroundSelected * 0.7f; - style.ProgressNormal = Color.FromBgra(0xFF0ad328); - - style.SharedTooltip = new Tooltip(); return style; } diff --git a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs index 7952099cc..7b4b35ed1 100644 --- a/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs +++ b/Source/Editor/SceneGraph/GUI/ActorTreeNode.cs @@ -385,20 +385,14 @@ namespace FlaxEditor.SceneGraph.GUI public ReparentAction(List actors) { - var allActors = new List - { - Capacity = Mathf.NextPowerOfTwo(actors.Count) - }; + var allActors = new List(Mathf.NextPowerOfTwo(actors.Count)); for (int i = 0; i < actors.Count; i++) { GetAllActors(allActors, actors[i]); } - var allScripts = new List