Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ViewportTitleDlg.cpp
This commit is contained in:
Danilo Aimini
2021-09-29 09:56:45 -07:00
245 changed files with 1693 additions and 900 deletions
@@ -10,6 +10,7 @@
#include <AzCore/Interface/Interface.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
#include <AzToolsFramework/UI/EditorEntityUi/EditorEntityUiInterface.h>
#include <AzToolsFramework/UI/Prefab/PrefabIntegrationBus.h>
@@ -8,7 +8,6 @@
#pragma once
#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
#include <AzCore/Serialization/SerializeContext.h>
namespace AzToolsFramework
{
@@ -10,6 +10,8 @@
#include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
#include <AzCore/RTTI/BehaviorContext.h>
namespace AzToolsFramework
{
namespace Prefab
@@ -7,6 +7,7 @@
*/
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Component/ComponentApplicationBus.h>
#include <AzCore/Settings/SettingsRegistry.h>
#include <AzToolsFramework/Prefab/Spawnable/PrefabConversionPipeline.h>