birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated all .material files to have materialTypeVersion instead of propertyLayoutVersion. This was renamed in code at some point but we forgot to rename in the files. Before this was silently ignored but since I removed MaterialSourceDataSerializer, this started being reported as a warning.

Browse Source 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
This commit is contained in:
santorac
2022-01-14 16:18:26 -08:00
parent 638fc027f5
commit f87d0f8386
231 changed files with 231 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"emissive": {
"color": [
AutomatedTesting/Gem/Sponza/Assets/objects/lightBlocker_lambert1.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"emissive": {
"color": [
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic.material
+1 -1
View File
@@ -1,6 +1,6 @@
{
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"baseColor": {
"color": [ 1.0, 1.0, 1.0 ],
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r00.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r01.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r02.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r03.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r04.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r05.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r06.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r07.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r08.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r09.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r10.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r00.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r01.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r02.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r03.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r04.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r05.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r06.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r07.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r08.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r09.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r10.material
+1 -1
View File
@@ -1,7 +1,7 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
AutomatedTesting/Materials/DefaultPBRTransparent.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "Materials/Presets/PBR/default_grid.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"opacity": {
"mode": "Blended"
AutomatedTesting/Materials/basic_grey.material
+1 -1
View File
@@ -1,6 +1,6 @@
{
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"baseColor": {
"color": [ 0.18, 0.18, 0.18 ],
AutomatedTesting/Objects/MorphTargets/DisplayWrinkleMaskBlendValues.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/Skin.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"wrinkleLayers": {
"count": 3,
Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneTransparentVisualization.material
+1 -1
View File
@@ -1,6 +1,6 @@
{
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"general": {
"enableShadows": false,
Gems/Atom/Feature/Common/Assets/Materials/OcclusionCullingPlane/OcclusionCullingPlaneVisualization.material
+1 -1
View File
@@ -1,6 +1,6 @@
{
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"general": {
"enableShadows": false,
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/default_grid.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"textureMap": "Textures/Default/default_basecolor.tif"
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_aluminum_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_brass_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_chrome_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_cobalt_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_copper_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_gold_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_iron_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_mercury.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_nickel_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_palladium_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_platinum_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_silver_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_matte.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/Presets/PBR/metal_titanium_polished.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/Feature/Common/Assets/Materials/ReflectionProbe/ReflectionProbeVisualization.material
+1 -1
View File
@@ -1,6 +1,6 @@
{
"materialType": "ReflectionProbeVisualization.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"general": {
"enableShadows": false,
Gems/Atom/Feature/Common/Assets/Materials/basic_grey.material
+1 -1
View File
@@ -1,6 +1,6 @@
{
"materialType": "Materials/Types/StandardPBR.materialtype",
"propertyLayoutVersion": 1,
"materialTypeVersion": 1,
"properties": {
"baseColor": {
"color": [ 0.18, 0.18, 0.18 ],
Gems/Atom/TestData/TestData/Materials/AutoBrick/Brick.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "TestData/Materials/Types/AutoBrick.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"appearance": {
"ao": 0.5252525210380554,
Gems/Atom/TestData/TestData/Materials/AutoBrick/Tile.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "TestData/Materials/Types/AutoBrick.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"appearance": {
"ao": 0.010100999847054482,
Gems/Atom/TestData/TestData/Materials/ParallaxRock.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "Materials/Presets/PBR/default_grid.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"occlusion": {
"diffuseTextureMap": "TestData/Textures/cc0/Rock030_2K_AmbientOcclusion.jpg"
Gems/Atom/TestData/TestData/Materials/SkinTestCases/001_hermanubis_regression_test.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/Skin.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/TestData/TestData/Materials/SkinTestCases/002_wrinkle_regression_test.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/Skin.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"enableLayer2": true,
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer2Off.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"enableLayer2": false
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures_Layer3Off.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"enableLayer3": false
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"enableLayer2": true,
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"debugDrawMode": "BlendMask"
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"debugDrawMode": "FinalBlendWeights"
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"debugDrawMode": "Displacement"
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"blendSource": "BlendMaskVertexColors"
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"blendSource": "Displacement",
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"enableLayer2": false
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"enableLayer3": false
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"blendSource": "Displacement_With_BlendMaskTexture"
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"displacementBlendDistance": 0.0010000000474974514
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"layer1_parallax": {
"offset": -0.03200000151991844,
Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
"parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"blend": {
"blendSource": "Displacement_With_BlendMaskVertexColors",
Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/001_DefaultWhite.material
+1 -1
View File
@@ -2,5 +2,5 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3
"materialTypeVersion": 3
}
Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/002_BaseColorLerp.material
+1 -1
View File
@@ -2,7 +2,7 @@
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [

Some files were not shown because too many files have changed in this diff Show More