Merge branch 'master' into ImprovementSlider
This commit is contained in:
@@ -81,7 +81,7 @@ namespace FlaxEngine
|
||||
!type.IsAbstract &&
|
||||
!type.IsArray &&
|
||||
!type.IsVoid &&
|
||||
(type.IsStructure || ScriptType.FlaxObject.IsAssignableFrom(type)) &&
|
||||
(type.IsStructure || type.IsScriptingObject) &&
|
||||
type.IsPublic &&
|
||||
type.CanCreateInstance;
|
||||
}
|
||||
|
||||
@@ -119,7 +119,8 @@ namespace FlaxEngine.GUI
|
||||
/// <param name="force">True if move to the front by force, otherwise false.</param>
|
||||
public void BringToFront(bool force = false)
|
||||
{
|
||||
_window.BringToFront(force);
|
||||
if (_window && _window.IsVisible)
|
||||
_window.BringToFront(force);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user