Merge remote-tracking branch 'origin/master' into 1.13
# Conflicts: # Content/Shaders/Editor/Grid.flax # Content/Shaders/GBuffer.flax # Content/Shaders/GlobalSignDistanceField.flax # Content/Shaders/ProbesFilter.flax # Content/Shaders/SSR.flax # Content/Shaders/VolumetricFog.flax # Development/Documentation/mono.md # Source/Editor/Modules/ContentDatabaseModule.cs
This commit is contained in:
@@ -505,7 +505,7 @@ namespace FlaxEditor.Modules.SourceCodeEditing
|
||||
base.OnUpdate();
|
||||
|
||||
// Automatic project files generation after workspace modifications
|
||||
if (_autoGenerateScriptsProjectFiles && ScriptsBuilder.IsSourceWorkspaceDirty && !ScriptsBuilder.IsCompiling)
|
||||
if (_autoGenerateScriptsProjectFiles && ScriptsBuilder.IsSourceWorkspaceDirty && !ScriptsBuilder.IsCompiling && Engine.HasFocus)
|
||||
{
|
||||
// Try to delay generation when a lot of files are added at once
|
||||
if (ScriptsBuilder.IsSourceDirtyFor(TimeSpan.FromMilliseconds(150)))
|
||||
|
||||
Reference in New Issue
Block a user