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

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

Browse Source
This commit is contained in:
Wojtek Figat
2023-07-09 11:55:50 +02:00
parent e4c3461053 c2da48c49f
commit 6ae77d0c17
25 changed files with 315 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Editor/CustomEditors/Editors/ColorEditor.cs
View File

@@ -41,7 +41,17 @@ namespace FlaxEditor.CustomEditors.Editors
}
else
{
element.CustomControl.Value = (Color)Values[0];
var value = Values[0];
if (value is Color asColor)
element.CustomControl.Value = asColor;
else if (value is Color32 asColor32)
element.CustomControl.Value = asColor32;
else if (value is Float4 asFloat4)
element.CustomControl.Value = asFloat4;
else if (value is Double4 asDouble4)
element.CustomControl.Value = (Float4)asDouble4;
else if (value is Vector4 asVector4)
element.CustomControl.Value = asVector4;
}
}
}

1
Source/Editor/CustomEditors/Editors/TagEditor.cs
View File

@@ -390,7 +390,6 @@ namespace FlaxEditor.CustomEditors.Editors
if (addTagDropPanel.IsClosed)
{
Debug.Log("Hit");
nameTextBox.BorderColor = Color.Transparent;
nameTextBox.BorderSelectedColor = FlaxEngine.GUI.Style.Current.BackgroundSelected;
return;

1
Source/Editor/Surface/ContextMenu/VisjectCM.cs
View File

@@ -363,7 +363,6 @@ namespace FlaxEditor.Surface.ContextMenu
Profiler.BeginEvent("VisjectCM.RemoveGroup");
if (group.Archetypes.Count == 0)
{
Debug.Log("Remove");
_groups.RemoveAt(i);
group.Dispose();
}