Merge branch 'fix-toolstrip-buildscene' of git://github.com/VNNCC/FlaxEngine into VNNCC-fix-toolstrip-buildscene

This commit is contained in:
Wojtek Figat
2020-12-30 22:58:31 +01:00

View File

@@ -161,7 +161,7 @@ namespace FlaxEditor.Modules
var undoRedo = Editor.Undo;
var gizmo = Editor.MainTransformGizmo;
var state = Editor.StateMachine.CurrentState;
var canEditScene = state.CanEditScene;
var canEditScene = state.CanEditScene && Level.IsAnySceneLoaded;
var canUseUndoRedo = state.CanUseUndoRedo;
var canEnterPlayMode = state.CanEnterPlayMode && Level.IsAnySceneLoaded;
var isPlayMode = Editor.StateMachine.IsPlayMode;
@@ -179,7 +179,7 @@ namespace FlaxEditor.Modules
_toolStripRotate.Checked = gizmoMode == TransformGizmoBase.Mode.Rotate;
_toolStripScale.Checked = gizmoMode == TransformGizmoBase.Mode.Scale;
//
_toolStripBuildScenes.Enabled = canEditScene && !isPlayMode;
_toolStripBuildScenes.Enabled = (canEditScene && !isPlayMode) || Editor.StateMachine.BuildingScenesState.IsActive;
//
var play = _toolStripPlay;
var pause = _toolStripPause;