From 41db22be3d0d1699850f840fcd75830af3d001b1 Mon Sep 17 00:00:00 2001
From: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
Date: Fri, 16 Apr 2021 17:06:58 -0700
Subject: [PATCH] [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence
 and CAnimSequence (#103)

* [CherryPick][LYN-2738] Fix Reflect functions of IAnimSequence and CAnimSequence (#85)
---
 Code/CryEngine/CryCommon/IMovieSystem.h       | 14 +++++-
 .../Code/Source/Cinematics/AnimSequence.cpp   | 43 +++++++++++++------
 .../Code/Source/Cinematics/AnimSequence.h     |  2 +-
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/Code/CryEngine/CryCommon/IMovieSystem.h b/Code/CryEngine/CryCommon/IMovieSystem.h
index 654ccfd240..7a1125ae2b 100644
--- a/Code/CryEngine/CryCommon/IMovieSystem.h
+++ b/Code/CryEngine/CryCommon/IMovieSystem.h
@@ -19,6 +19,7 @@
 #include <AzCore/Component/EntityId.h>
 #include <AzCore/Math/Crc.h>
 #include <AzCore/Math/Quaternion.h>
+#include <AzCore/Serialization/SerializeContext.h>
 
 #include <Range.h>
 #include <AnimKey.h>
@@ -914,9 +915,18 @@ struct IAnimStringTable
  */
 struct IAnimSequence
 {
-    AZ_RTTI(IAnimSequence, "{A60F95F5-5A4A-47DB-B3BB-525BBC0BC8DB}")
+    AZ_RTTI(IAnimSequence, "{A60F95F5-5A4A-47DB-B3BB-525BBC0BC8DB}");
+    AZ_CLASS_ALLOCATOR(IAnimSequence, AZ::SystemAllocator, 0);
 
-    static const int kSequenceVersion = 4;
+    static const int kSequenceVersion = 5;
+
+    static void Reflect(AZ::ReflectContext* context)
+    {
+        if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
+        {
+            serializeContext->Class<IAnimSequence>();
+        }
+    }
 
     //! Flags used for SetFlags(),GetFlags(),SetParentFlags(),GetParentFlags() methods.
     enum EAnimSequenceFlags
diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
index 8d6c547c0e..ffbdce8ed6 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
@@ -823,20 +823,37 @@ void CAnimSequence::SetId(uint32 newId)
 }
 
 //////////////////////////////////////////////////////////////////////////
-void CAnimSequence::Reflect(AZ::SerializeContext* serializeContext)
+static bool AnimSequenceVersionConverter(
+    AZ::SerializeContext& serializeContext,
+    AZ::SerializeContext::DataElementNode& rootElement)
 {
-    serializeContext->Class<CAnimSequence>()
-        ->Version(4)
-        ->Field("Name", &CAnimSequence::m_name)
-        ->Field("SequenceEntityId", &CAnimSequence::m_sequenceEntityId)
-        ->Field("Flags", &CAnimSequence::m_flags)
-        ->Field("TimeRange", &CAnimSequence::m_timeRange)
-        ->Field("ID", &CAnimSequence::m_id)
-        ->Field("Nodes", &CAnimSequence::m_nodes)
-        ->Field("SequenceType", &CAnimSequence::m_sequenceType)
-        ->Field("Events", &CAnimSequence::m_events)
-        ->Field("Expanded", &CAnimSequence::m_expanded)
-        ->Field("ActiveDirectorNodeId", &CAnimSequence::m_activeDirectorNodeId);
+    if (rootElement.GetVersion() < 5)
+    {
+        rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid<IAnimSequence>());
+    }
+
+    return true;
+}
+
+void CAnimSequence::Reflect(AZ::ReflectContext* context)
+{
+    IAnimSequence::Reflect(context);
+
+    if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
+    {
+        serializeContext->Class<CAnimSequence, IAnimSequence>()
+            ->Version(IAnimSequence::kSequenceVersion, &AnimSequenceVersionConverter)
+            ->Field("Name", &CAnimSequence::m_name)
+            ->Field("SequenceEntityId", &CAnimSequence::m_sequenceEntityId)
+            ->Field("Flags", &CAnimSequence::m_flags)
+            ->Field("TimeRange", &CAnimSequence::m_timeRange)
+            ->Field("ID", &CAnimSequence::m_id)
+            ->Field("Nodes", &CAnimSequence::m_nodes)
+            ->Field("SequenceType", &CAnimSequence::m_sequenceType)
+            ->Field("Events", &CAnimSequence::m_events)
+            ->Field("Expanded", &CAnimSequence::m_expanded)
+            ->Field("ActiveDirectorNodeId", &CAnimSequence::m_activeDirectorNodeId);
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h
index 3069896f50..d54b48c9eb 100644
--- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h
+++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.h
@@ -154,7 +154,7 @@ public:
         return m_nextTrackId++;
     }
 
-    static void Reflect(AZ::SerializeContext* serializeContext);
+    static void Reflect(AZ::ReflectContext* context);
 
 private:
     void ComputeTimeRange();