Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts: # Source/Editor/Windows/Profiler/Memory.cs
This commit is contained in:
@@ -69,6 +69,7 @@ namespace FlaxEditor.Windows.Profiler
|
||||
{
|
||||
AnchorPreset = AnchorPresets.HorizontalStretchTop,
|
||||
Offsets = Margin.Zero,
|
||||
Pivot = Float2.Zero,
|
||||
IsScrollable = true,
|
||||
Parent = panel,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user