merge from development

Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-21 10:05:32 +01:00
parent 4438192d04 c831f8037a
commit c0f27bd7bc
109 changed files with 13840 additions and 14002 deletions
@@ -7,6 +7,7 @@
 */
 #pragma once

+#include <AzCore/Component/EntityId.h>
 #include <AzCore/Math/Transform.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Memory/Memory.h>
@@ -7,6 +7,8 @@
 */

 #pragma once
+
+#include <AzCore/std/containers/stack.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>

 namespace UnitTest
@@ -8,6 +8,7 @@

 #include <AzFramework/Visibility/OctreeSystemComponent.h>
 #include <AzCore/Math/ShapeIntersection.h>
+#include <AzCore/Serialization/SerializeContext.h>

 namespace AzFramework
 {