Merging latest origin

2021-05-07 16:28:11 -07:00
parent 80f6dcd258 4c453bf4b6
commit 1df2fe1d48
141 changed files with 2843 additions and 1178 deletions
@@ -36,6 +36,8 @@ namespace AzFramework

    void NonUniformScaleComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
    {
+        incompatible.push_back(AZ_CRC_CE("NonUniformScaleService"));
+
        incompatible.push_back(AZ_CRC_CE("DebugDrawObbService"));
        incompatible.push_back(AZ_CRC_CE("DebugDrawService"));
        incompatible.push_back(AZ_CRC_CE("EMotionFXActorService"));