merging latest dev + resolving 1 conflict

Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-10-06 16:55:58 -07:00
parent f8d1c568fd 029ad32c84
commit d2da35aec3
1635 changed files with 159616 additions and 23634 deletions
@@ -21,9 +21,9 @@ set(ENABLED_GEMS
    QtForPython
    PythonAssetBuilder
    Metastream
-
    Camera
    EMotionFX
+    AtomTressFX
    PhysX
    CameraFramework
    StartingPointMovement
@@ -52,10 +52,7 @@ set(ENABLED_GEMS
    AWSCore
    AWSClientAuth
    AWSMetrics
-
-
-
-    
+    PrefabBuilder
    AudioSystem
    Multiplayer
 )