Merge branch 'FlaxEngine:master' into fix/nullable
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -139,6 +139,8 @@ namespace FlaxEditor.GUI.Docking
|
||||
/// <inheritdoc />
|
||||
protected override void OnLastTabRemoved()
|
||||
{
|
||||
if (ChildPanelsCount > 0)
|
||||
return;
|
||||
// Close window
|
||||
_window?.Close();
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -397,6 +397,7 @@ namespace MF
|
||||
// Loop
|
||||
playerMF.Time.Ticks %= player.Duration.Ticks;
|
||||
playerMF.Seek = 1;
|
||||
player.PlayAudio();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user