GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Source/Engine/Content/JsonAsset.cpp
This commit is contained in:
Wojciech Figat
2022-10-19 13:36:46 +02:00
parent ff49401f3a f6857f66ba
commit e115aa2c4e
32 changed files with 362 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/CustomEditors/Dedicated/LayersMatrixEditor.cs
View File

@@ -24,7 +24,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
public override void Initialize(LayoutElementsContainer layout)
{
string[] layerNames = LayersAndTagsSettings.GetCurrentLayers();
int layersCount = Math.Max(4, layerNames.Length);
int layersCount = layerNames.Length;
_checkBoxes = new List<CheckBox>();
_layersCount = layersCount;

2
Source/Editor/CustomEditors/Elements/FloatValueElement.cs
View File

@@ -22,7 +22,7 @@ namespace FlaxEditor.CustomEditors.Elements
/// <summary>
/// [Deprecated on 26.05.2022, expires on 26.05.2024]
/// </summary>
[System.Obsolete("Deprecated in 1.4")]
[System.Obsolete("Deprecated in 1.4, ValueBox instead")]
public FloatValueBox FloatValue => ValueBox;
/// <summary>