merging from main

2021-04-15 08:18:11 +01:00
parent 217009de2b 70c2d5ee40
commit d8169e08fb
2503 changed files with 45147 additions and 527864 deletions
@@ -67,6 +67,8 @@ namespace AZ
            AZ_CLASS_ALLOCATOR(MeshComponentController, AZ::SystemAllocator, 0);
            AZ_RTTI(AZ::Render::MeshComponentController, "{D0F35FAC-4194-4C89-9487-D000DDB8B272}");

+            ~MeshComponentController();
+
            static void Reflect(AZ::ReflectContext* context);
            static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
            static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);