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

Fix for editor

Browse Source
This commit is contained in:
Wojtek Figat
2022-02-06 14:11:31 +01:00
parent 748d69a3cb
commit 9cfc638ce0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Content/Proxy/CollisionDataProxy.cs
View File

@@ -107,7 +107,7 @@ namespace FlaxEditor.Content
if (childFolderChild is BinaryAssetItem c && c.IsOfType<CollisionData>())
{
var collisionData = FlaxEngine.Content.Load<CollisionData>(c.ID);
if (collisionData && collisionData.Options.Model == model.ID || collisionData.Options.Model == Guid.Empty)
if (collisionData && (collisionData.Options.Model == model.ID || collisionData.Options.Model == Guid.Empty))
{
Editor.Instance.Windows.ContentWin.Select(c);
if (created != null)

6
Source/Editor/CustomEditors/Values/ValueContainer.cs
View File

@@ -229,7 +229,13 @@ namespace FlaxEditor.CustomEditors
for (int i = 0; i < Count; i++)
{
if (!Equals(this[i], _defaultValue))
{
// Special case for String (null string is kind of equal to empty string from the user perspective)
if (this[i] == null && _defaultValue is string defaultValueStr && defaultValueStr.Length == 0)
continue;
return true;
}
}
}
return false;