Merge branch 'master' into Fix-Dropdown
This commit is contained in:
@@ -24,7 +24,7 @@ namespace FlaxEditor.CustomEditors.Editors
|
||||
/// <summary>
|
||||
/// The Z axis color.
|
||||
/// </summary>
|
||||
public static Color AxisColorZ = new Color(0.0f, 0.0235294f, 0.9f, 1.0f);
|
||||
public static Color AxisColorZ = new Color(0.0f, 0.42352f, 0.8f, 1.0f);
|
||||
|
||||
/// <summary>
|
||||
/// Custom editor for actor position property.
|
||||
|
||||
@@ -257,7 +257,7 @@ namespace FlaxEditor.Windows
|
||||
private void UpdateCameraPreview()
|
||||
{
|
||||
// Disable rendering preview during GI baking
|
||||
if (Editor.StateMachine.CurrentState.IsPerformanceHeavy)
|
||||
if (Editor == null || Editor.StateMachine.CurrentState.IsPerformanceHeavy)
|
||||
{
|
||||
HideAllCameraPreviews();
|
||||
return;
|
||||
@@ -406,6 +406,14 @@ namespace FlaxEditor.Windows
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnSizeChanged()
|
||||
{
|
||||
base.OnSizeChanged();
|
||||
|
||||
UpdateCameraPreview();
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void OnDestroy()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user