Merge branch 'development' into cmake/SPEC-7484

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/ResourceSelectorHost.cpp
2021-08-11 07:55:26 -07:00
parent d71674579a a26d6d5ec9
commit 9f7d280a1e
77 changed files with 248 additions and 1003 deletions
@@ -10,6 +10,7 @@

 #if !defined(Q_MOC_RUN)
 #include <AzCore/std/containers/list.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <QSortFilterProxyModel>
 #endif

@@ -10,6 +10,7 @@

 #if !defined(Q_MOC_RUN)
 #include "AssetDetailsPanel.h"
+#include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <QScopedPointer>
 #endif