From 9081a0db903cffd8aa4c85a2cedf73b843feaf58 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 1 Feb 2022 09:51:22 -0800 Subject: [PATCH] use material included and remove unused decal material Signed-off-by: Scott Murray --- .../hydra_AtomEditorComponents_DecalAdded.py | 2 +- .../Materials/decal/scorch_01_decal.material | 35 ------------------- .../Materials/decal/scorch_01_decal.tif | 3 -- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 AutomatedTesting/Materials/decal/scorch_01_decal.material delete mode 100644 AutomatedTesting/Materials/decal/scorch_01_decal.tif diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DecalAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DecalAdded.py index 238a2e31cb..6136e1021b 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DecalAdded.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DecalAdded.py @@ -147,7 +147,7 @@ def AtomEditorComponents_Decal_AddedToEntity(): Report.result(Tests.creation_redo, decal_entity.exists()) # 5. Set Material property on Decal component. - decal_material_asset_path = os.path.join("materials", "basic_grey.azmaterial") + decal_material_asset_path = os.path.join("Materials", "decal", "airship_symbol_decal.azmaterial") decal_material_asset = Asset.find_asset_by_path(decal_material_asset_path, False) decal_component.set_component_property_value(AtomComponentProperties.decal('Material'), decal_material_asset.id) get_material_property = decal_component.get_component_property_value(AtomComponentProperties.decal('Material')) diff --git a/AutomatedTesting/Materials/decal/scorch_01_decal.material b/AutomatedTesting/Materials/decal/scorch_01_decal.material deleted file mode 100644 index 3f700d483a..0000000000 --- a/AutomatedTesting/Materials/decal/scorch_01_decal.material +++ /dev/null @@ -1,35 +0,0 @@ -{ - "materialType": "Materials/Types/StandardPBR.materialtype", - "materialTypeVersion": 4, - "properties": { - "baseColor": { - "textureMap": "Materials/decal/scorch_01_decal.tif" - }, - "general": { - "doubleSided": true - }, - "metallic": { - "useTexture": false - }, - "normal": { - "useTexture": false - }, - "opacity": { - "factor": 1.0, - "mode": "Blended", - "textureMap": "Materials/decal/scorch_01_decal.tif" - }, - "roughness": { - "useTexture": false - }, - "specularF0": { - "useTexture": false - }, - "uv": { - "center": [ - 0.0, - 1.0 - ] - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Materials/decal/scorch_01_decal.tif b/AutomatedTesting/Materials/decal/scorch_01_decal.tif deleted file mode 100644 index 935388bd93..0000000000 --- a/AutomatedTesting/Materials/decal/scorch_01_decal.tif +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:889072da11d2034a0d37ec6ae81b551a61b62d6d602965b0b919a999c56d67e2 -size 16793812