Merge branch 'FlaxEngine:master' into fix/nullable

This commit is contained in:
Mateusz Karbowiak
2024-10-07 16:34:37 +02:00
committed by GitHub
4 changed files with 13 additions and 3 deletions

View File

@@ -32,6 +32,14 @@ namespace FlaxEditor.Content
/// <inheritdoc />
public override EditorWindow Open(Editor editor, ContentItem item)
{
#if PLATFORM_WINDOWS
CreateProcessSettings settings = new CreateProcessSettings
{
ShellExecute = true,
FileName = item.Path
};
Platform.CreateProcess(ref settings);
#endif
return null;
}

View File

@@ -139,6 +139,8 @@ namespace FlaxEditor.GUI.Docking
/// <inheritdoc />
protected override void OnLastTabRemoved()
{
if (ChildPanelsCount > 0)
return;
// Close window
_window?.Close();
}

View File

@@ -60,14 +60,13 @@ Vector3 GetVector3FromXml(const xml_node& parent, const PUGIXML_CHAR* name, cons
if (x && y && z)
{
XmlCharAsChar xs(x), ys(y), zs(z);
Vector3 v;
Float3 v;
if (!StringUtils::Parse(xs.Str, &v.X) && !StringUtils::Parse(ys.Str, &v.Y) && !StringUtils::Parse(zs.Str, &v.Z))
{
return v;
return (Vector3)v;
}
}
}
return defaultValue;
}

View File

@@ -397,6 +397,7 @@ namespace MF
// Loop
playerMF.Time.Ticks %= player.Duration.Ticks;
playerMF.Seek = 1;
player.PlayAudio();
}
else
{