Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -40,7 +40,7 @@ def C4982802_PhysXColliderShape_CanBeSelected():
     6) Verify they have been changed

    Note:
-     - This test file must be called from the Lumberyard Editor command terminal
+     - This test file must be called from the Open 3D Engine Editor command terminal
     - Any passed and failed tests are written to the Editor.log file.
            Parsing the file or running a log_monitor are required to observe the test results.

@@ -54,7 +54,7 @@ def C4982802_PhysXColliderShape_CanBeSelected():
    from utils import TestHelper as helper
    from editor_entity_utils import EditorEntity as Entity

-    # Lumberyard Imports
+    # Open 3D Engine Imports
    import azlmbr.math as math

    CAPSULE_SHAPETYPE_ENUM = 2