From e1b55d8f0ad61f193dcfadb90e8df4402a231dab Mon Sep 17 00:00:00 2001 From: jromnoa Date: Tue, 27 Apr 2021 16:59:53 -0700 Subject: [PATCH] change property call to the new Atom properties for Decal (Atom) --- .../hydra_AtomEditorComponents_AddedToEntity.py | 4 ++-- .../Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py index ced312c813..062c449ab7 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py @@ -168,12 +168,12 @@ def run(): entity_obj, ["Capsule Shape"], area_light)) # Decal Component - material_asset_path = os.path.join("Materials", "basic_grey.material") + material_asset_path = os.path.join("AutomatedTesting", "Materials", "basic_grey.material") material_asset = asset.AssetCatalogRequestBus( bus.Broadcast, "GetAssetIdByPath", material_asset_path, math.Uuid(), False) ComponentTests( "Decal (Atom)", lambda entity_obj: verify_set_property( - entity_obj, "Settings|Decal Settings|Material", material_asset)) + entity_obj, "Controller|Configuration|Material", material_asset)) # DepthOfField Component camera_entity = hydra.Entity("camera_entity") diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py index 42875aa2cf..16139e3f66 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py @@ -63,7 +63,7 @@ class TestAtomEditorComponentsMain(object): "Decal (Atom)_test: Component added after REDO: True", "Decal (Atom)_test: Entered game mode: True", "Decal (Atom)_test: Exit game mode: True", - "Decal (Atom) Settings|Decal (Atom) Settings|Material: SUCCESS", + "Decal (Atom) Controller|Configuration|Material: SUCCESS", "Decal (Atom)_test: Entity is hidden: True", "Decal (Atom)_test: Entity is shown: True", "Decal (Atom)_test: Entity deleted: True",