Fixed NvCloth assets, NvCloth automated test scripts, ModelAsset cloning and UI reverse overrides menu crash (#3851)

- Fixed cloth asset, which stopped working due to Updated skeleton logic: #2957 which changes how fbx graph nodes are collected (affecting its names, which is used by cloth modifier). - Fixed cloth test suite active call to base's run_test function. It stopped working when its signature was changed here: 182d410#diff-3f5d93b0a76c838893693f19f2eacfe3e67040d445d6463c5c425ef5075cb409 - Renamed nvcloth TestSuite_Active.py to TestSuite_Main.py to be consistent with the other test folders. - Fixed ModelAsset creator clone function. It was missing to copy the material slots, ultimately causing Material Component to show 0 material slots. - Fixed crash where the revert overrides menu was not created when checking changes for selected component and selected entities. Signed-off-by: moraaar moraaar@amazon.com
2021-09-02 09:35:12 +01:00
parent 7e61197450
commit 9a0ea2c4c5
31 changed files with 737 additions and 756 deletions
@@ -45,10 +45,6 @@ def C18977329_NvCloth_AddClothSimulationToMesh():
    from editor_python_test_tools.editor_entity_utils import EditorEntity
    from editor_python_test_tools.utils import Report
    
-    # Helper file Imports
-    import ImportPathHelper as imports
-
-    imports.init()
    from editor_python_test_tools.utils import TestHelper as helper
    from editor_python_test_tools.utils import Tracer
    
@@ -84,7 +80,5 @@ def C18977329_NvCloth_AddClothSimulationToMesh():
    helper.close_editor()

 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
    from editor_python_test_tools.utils import Report
    Report.start_test(C18977329_NvCloth_AddClothSimulationToMesh)
@@ -44,11 +44,7 @@ def C18977330_NvCloth_AddClothSimulationToActor():
    
    from editor_python_test_tools.editor_entity_utils import EditorEntity
    from editor_python_test_tools.utils import Report
-    
-    # Helper file Imports
-    import ImportPathHelper as imports

-    imports.init()
    from editor_python_test_tools.utils import TestHelper as helper
    from editor_python_test_tools.utils import Tracer
    
@@ -84,7 +80,5 @@ def C18977330_NvCloth_AddClothSimulationToActor():
    helper.close_editor()

 if __name__ == "__main__":
-    import ImportPathHelper as imports
-    imports.init()
    from editor_python_test_tools.utils import Report
    Report.start_test(C18977330_NvCloth_AddClothSimulationToActor)
@@ -12,7 +12,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
        TEST_SUITE main
        TEST_REQUIRES gpu
        TEST_SERIAL
-        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Active.py
+        PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
        RUNTIME_DEPENDENCIES
            Legacy::Editor
            AZ::AssetProcessor
@@ -1,11 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
-def init():
-    import os
-    import sys
-    sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared')
@@ -22,12 +22,11 @@ from base import TestAutomationBase
 class TestAutomation(TestAutomationBase):

    use_null_renderer = False  # Use default renderer (needs gpu)
-    extra_cmdline_args = []

    def test_C18977329_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform):
        from . import C18977329_NvCloth_AddClothSimulationToMesh as test_module
-        self._run_test(request, workspace, editor, test_module, self.extra_cmdline_args, self.use_null_renderer)
+        self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer)

    def test_C18977330_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform):
        from . import C18977330_NvCloth_AddClothSimulationToActor as test_module
-        self._run_test(request, workspace, editor, test_module, self.extra_cmdline_args, self.use_null_renderer)
+        self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer)
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6517300fb1ce70c4696286e14715c547cfd175eabbb2042f7f2a456b15054224
-size 5253
+oid sha256:bedd2adc60f244a8595e64619069046d5036dd762f61b5393f9b759d69281362
+size 5276
@@ -1,6 +1,6 @@
 <download name="C18977329_NvCloth_AddClothSimulationToMesh" type="Map">
 <index src="filelist.xml" dest="filelist.xml"/>
 <files>
-  <file src="level.pak" dest="level.pak" size="96A3" md5="db8a235878128076005ade018587f536"/>
+  <file src="level.pak" dest="level.pak" size="969F" md5="82f4dd8bb6fb27325a4e237e8d22b8d3"/>
 </files>
 </download>
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce32a7cdf3ed37751385b3bb18f05206702978363f325d06727b5eb20d40b7eb
-size 38563
+oid sha256:81fc98854424d55e594a3983da53d2f5a4d7a7cf60e52e12366e4800d1d3f080
+size 38559
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89dbcec013cb819e52ec0f8fed0a9e417fd32eac8aeb67d3958266bb6089ec21
-size 5505
+oid sha256:b59cbe84cb77090d723d120597f9d11817aa67a267a7f495f8b012fdd8a9dd86
+size 5536
@@ -1,6 +1,6 @@
 <download name="C18977330_NvCloth_AddClothSimulationToActor" type="Map">
 <index src="filelist.xml" dest="filelist.xml"/>
 <files>
-  <file src="level.pak" dest="level.pak" size="E16" md5="036b4a87cbb256f76823549ab4b18c05"/>
+  <file src="level.pak" dest="level.pak" size="E40" md5="9d58d7abc4cd4560a4d9c4e5ef2b99e4"/>
 </files>
 </download>
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:622c2624b04e07b704520f32c458b50d5a50de1ef116b7bc9c3c0ccb6f4a4ecc
-size 3606
+oid sha256:46051f4116003e1a2d13855bea92a1b15501166b1379a11d02c4d2239ccd2530
+size 3648