birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin.cpp
+28 -10
View File
@@ -152,17 +152,35 @@ ComponentEntityEditorPlugin::ComponentEntityEditorPlugin([[maybe_unused]] IEdito
LyViewPane::CategoryTools,
levelInspectorOptions);
ViewPaneOptions outlinerOptions;
outlinerOptions.canHaveMultipleInstances = true;
outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
if (GetIEditor()->IsPrefabSystemEnabled())
{
// Add the new Outliner to the Tools Menu
// this pane was originally introduced with this name, so layout settings are all saved with that name, despite the preview label being removed.
outlinerOptions.saveKeyName = "Entity Outliner (PREVIEW)";
RegisterViewPane<QComponentEntityEditorOutlinerWindow>(
LyViewPane::EntityOutliner,
LyViewPane::CategoryTools,
outlinerOptions);
ViewPaneOptions outlinerOptions;
outlinerOptions.canHaveMultipleInstances = true;
outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
RegisterViewPane<QEntityOutlinerWindow>(
LyViewPane::EntityOutliner,
LyViewPane::CategoryTools,
outlinerOptions);
}
else
{
// Add the Legacy Outliner to the Tools Menu
ViewPaneOptions outlinerOptions;
outlinerOptions.canHaveMultipleInstances = true;
outlinerOptions.preferedDockingArea = Qt::LeftDockWidgetArea;
// this pane was originally introduced with this name, so layout settings are all saved with that name, despite the preview label being removed.
outlinerOptions.saveKeyName = "Entity Outliner (PREVIEW)";
RegisterViewPane<QComponentEntityEditorOutlinerWindow>(
LyViewPane::EntityOutliner,
LyViewPane::CategoryTools,
outlinerOptions);
}
AzToolsFramework::ViewPaneOptions options;
options.preferedDockingArea = Qt::NoDockWidgetArea;