From 60f7ea54aa3eaadc4a709ecf331b30e7fda05e6b Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Mon, 15 Nov 2021 17:45:52 -0600 Subject: [PATCH] Reverting unintentional change to create_vegetation_area() helper Signed-off-by: jckand-amzn --- .../EditorScripts/DynVegUtils_TempPrefabCreationWorks.py | 3 +-- .../large_worlds_utils/editor_dynveg_test_helper.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py index 3aac745149..16a6c2eda6 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py @@ -33,7 +33,6 @@ def DynVegUtils_TempPrefabCreationWorks(): import azlmbr.asset as asset import azlmbr.bus as bus - import azlmbr.legacy.general as general import azlmbr.math as math from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg @@ -73,7 +72,7 @@ def DynVegUtils_TempPrefabCreationWorks(): ) test_physx_mesh_asset_id = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", os.path.join( "assets", "objects", "foliage", "cedar.pxmesh"), math.Uuid(), False) - dynveg.create_temp_physx_mesh_collider(test_physx_mesh_asset_id, "CedarTree_Collision") + dynveg.create_temp_physx_mesh_collider(test_physx_mesh_asset_id, physx_prefab_filename) Report.result(physx_collider_prefab_created, helper.wait_for_condition(lambda: PrefabInstance.is_valid(prefab[1]), 3.0)) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py index 9840a4c5fd..d840628abc 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py @@ -123,7 +123,7 @@ def create_vegetation_area(name, center_point, box_size_x, box_size_y, box_size_ # Set the vegetation area to a Dynamic Slice spawner with a specific slice asset selected dynamic_slice_spawner = vegetation.DynamicSliceInstanceSpawner() dynamic_slice_spawner.SetSliceAssetPath(dynamic_slice_asset_path) - descriptor = vegetation.Descriptor() + descriptor = hydra.get_component_property_value(spawner_entity.components[2], 'Configuration|Embedded Assets|[0]') descriptor.spawner = dynamic_slice_spawner spawner_entity.get_set_test(2, "Configuration|Embedded Assets|[0]", descriptor) return spawner_entity