From 272b9ba9c7b8d365e575115e9534158a29176a0b Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Wed, 14 Jul 2021 09:37:01 -0700
Subject: [PATCH] Code/Legacy/CryCommon

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h | 3 +++
 Code/Legacy/CryCommon/IMovieSystem.h                         | 2 +-
 Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h           | 2 --
 Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h          | 4 ----
 Code/Legacy/CryCommon/Maestro/Types/AnimValue.h              | 2 --
 Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h          | 4 ----
 Code/Legacy/CryCommon/Maestro/Types/SequenceType.h           | 4 ----
 7 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h b/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h
index 1784bee93e..4acc1a833f 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/MaterialBus.h
@@ -12,6 +12,9 @@
 
 namespace Physics
 {
+    class ShapeConfiguration;
+    class MaterialSelection;
+
     /// Listens to requests for physics materials.
     class PhysicsMaterialRequests
         : public AZ::EBusTraits
diff --git a/Code/Legacy/CryCommon/IMovieSystem.h b/Code/Legacy/CryCommon/IMovieSystem.h
index 2c9a4d0620..d1714e217e 100644
--- a/Code/Legacy/CryCommon/IMovieSystem.h
+++ b/Code/Legacy/CryCommon/IMovieSystem.h
@@ -62,7 +62,7 @@ typedef IMovieSystem* (* PFNCREATEMOVIESYSTEM)(struct ISystem*);
 typedef std::vector<IAnimSequence*> AnimSequences;
 typedef AZStd::vector<AZStd::string> TrackEvents;
 
-// Forward declare, including will cause much pain with the precompiled headers
+// Forward declare
 enum class SequenceType;
 enum class AnimNodeType;
 enum class AnimValueType;
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h
index 192af7381f..7370aa1a1f 100644
--- a/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimNodeType.h
@@ -10,8 +10,6 @@
 #define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
 #pragma once
 
-// **NOTE**: Do not include into the precompiled header hierarchy!
-
 //////////////////////////////////////////////////////////////////////////
 //! Node-Types
 //
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h
index 96533510ca..69762a431b 100644
--- a/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimParamType.h
@@ -10,10 +10,6 @@
 #define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMPARAMTYPE_H
 #pragma once
 
-// **NOTES**: Do not include into the precompiled header hierarchy!
-//            There are a couple legacy defines in IMovieSystem.h that
-//            correspond to these values. ByString and Invalid.
-
 // Static common parameters IDs of animation node.
 //
 // You need to register new params in Movie.cpp/RegisterParamTypes for serialization.
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimValue.h b/Code/Legacy/CryCommon/Maestro/Types/AnimValue.h
index 54e5f0c21d..834c6a6e97 100644
--- a/Code/Legacy/CryCommon/Maestro/Types/AnimValue.h
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimValue.h
@@ -10,8 +10,6 @@
 #define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
 #pragma once
 
-// **NOTE**: Do not include into the precompiled header hierarchy!
-
 //! Values that animation track can hold.
 // Do not change values! they are serialized
 //
diff --git a/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h b/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h
index 526212261a..b7b6ffa57d 100644
--- a/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h
+++ b/Code/Legacy/CryCommon/Maestro/Types/AnimValueType.h
@@ -10,10 +10,6 @@
 #define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
 #pragma once
 
-// **NOTES**: Do not include into the precompiled header hierarchy!
-//            There are a couple legacy defines in IMovieSystem.h that
-//            correspond to these values. Unknown and Float.
-
 //! Values that animation track can hold.
 // Do not change values! they are serialized
 //
diff --git a/Code/Legacy/CryCommon/Maestro/Types/SequenceType.h b/Code/Legacy/CryCommon/Maestro/Types/SequenceType.h
index eb9ef09847..b3361e7950 100644
--- a/Code/Legacy/CryCommon/Maestro/Types/SequenceType.h
+++ b/Code/Legacy/CryCommon/Maestro/Types/SequenceType.h
@@ -10,10 +10,6 @@
 #define CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
 #pragma once
 
-// **NOTES**: Do not include into the precompiled header hierarchy!
-//            There is a legacy define in IMovieSystem.h that
-//            correspond to a value, Legacy.
-
 enum class SequenceType
 {
     Legacy                = 0,        // legacy CryEntity Sequence Object