Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts: # Source/Editor/Viewport/PrefabWindowViewport.cs # Source/Engine/Physics/PhysX/SimulationEventCallbackPhysX.cpp
This commit is contained in:
@@ -142,6 +142,8 @@ namespace FlaxEditor.Windows
|
||||
Title = "Content";
|
||||
Icon = editor.Icons.Folder32;
|
||||
|
||||
FlaxEditor.Utilities.Utils.SetupCommonInputActions(this);
|
||||
|
||||
// Content database events
|
||||
editor.ContentDatabase.WorkspaceModified += () => _isWorkspaceDirty = true;
|
||||
editor.ContentDatabase.ItemRemoved += OnContentDatabaseItemRemoved;
|
||||
|
||||
Reference in New Issue
Block a user