Merge remote-tracking branch 'origin' into MultiplayerComponents

2021-05-06 19:40:09 -07:00
parent b2b632aede cd0628f513
commit c21b4a577d
162 changed files with 15328 additions and 854 deletions
@@ -131,6 +131,7 @@ namespace AZ
        void MeshComponentController::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
        {
            dependent.push_back(AZ_CRC("TransformService", 0x8ee22c50));
+            dependent.push_back(AZ_CRC_CE("NonUniformScaleService"));
        }

        void MeshComponentController::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)