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

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

Browse Source 
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
parent b28f871b20 a8559c4000
commit 3b9c3f832a
245 changed files with 1693 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/ViewportTitleDlg.cpp
+5 -1
View File
@@ -37,9 +37,13 @@
#include "MathConversion.h"
#include "EditorViewportSettings.h"
#include <AzCore/std/algorithm.h>
#include <AzCore/Asset/AssetSerializer.h>
#include <AzCore/Casting/numeric_cast.h>
<<<<<<< HEAD
#include <AzFramework/API/ApplicationAPI.h>
=======
#include <AzCore/std/algorithm.h>
>>>>>>> a8559c4000297b8c2876b8213d83f1678dbc3d84
#include <AzToolsFramework/Viewport/ViewportMessages.h>
#include <LmbrCentral/Audio/AudioSystemComponentBus.h>