Update material version numbers

Merge pull request #237 from aws-lumberyard-dev/Atom/santorac/UpdateMaterialVersionFieldNames

Updated existing .material files to use the new materialTypeVersion field name instead of propertyLayoutVersion
Moved the .materialtype version number to the new correct position.

Materials/Decal/airship_nose_number_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/airship_nose_number_decal.tif"

Materials/Decal/airship_symbol_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/airship_symbol_decal.tif"

Materials/Decal/airship_tail_01_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/airship_tail_01_decal.tif"

Materials/Decal/airship_tail_02_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/airship_tail_02_decal.tif"

Materials/Decal/am_mud_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/am_mud_decal.tif"

Materials/Decal/am_road_dust_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/am_road_dust_decal.tif"

Materials/Decal/brushstoke_01_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/brushstoke_01_decal.tif"

Materials/Decal/scorch_01_decal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials/Types/StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/Decal/scorch_01_decal.tif"

Materials/DefaultPBR.material

@@ -2,5 +2,5 @@
     "description": "",
     "materialType": "Materials/Types/StandardPBR.materialtype",
     "parentMaterial": "Materials/Presets/PBR/default_grid.material",
-    "propertyLayoutVersion": 3
+    "materialTypeVersion": 3
 }

Materials/DefaultPBRTransparent.material

@@ -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"

Materials/DiffuseGIExample/blue.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/DiffuseGIExample/green.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/DiffuseGIExample/red.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/DiffuseGIExample/white.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/DiffuseGIExample/yellow.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/DynamicMaterialTest/EmissiveWithCppFunctors.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials/DynamicMaterialTest/EmissiveWithCppFunctors.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "emissive": {
             "color": [

Materials/DynamicMaterialTest/EmissiveWithCppFunctors.materialtype

@@ -1,7 +1,7 @@
 {
     "description": "Simple material for comparing the performance of hard-coded C++ material functors.",
+    "version": 3,
     "propertyLayout": {
-        "version": 3,
         "groups": [
             {
                 "id": "emissive",

Materials/DynamicMaterialTest/EmissiveWithLuaFunctors.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials/DynamicMaterialTest/EmissiveWithLuaFunctors.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "emissive": {
             "color": [

Materials/DynamicMaterialTest/EmissiveWithLuaFunctors.materialtype

@@ -1,7 +1,7 @@
 {
     "description": "Simple material for comparing the performance of hard-coded C++ material functors.",
+    "version": 3,
     "propertyLayout": {
-        "version": 3,
         "groups": [
             {
                 "id": "emissive",

Materials/HotReloadTest/TestData/MaterialType_StraightLines.txt

@@ -1,6 +1,5 @@
 {
     "propertyLayout": {
-        "version": 1,
         "properties": {
             "general": [
                 {

Materials/HotReloadTest/TestData/MaterialType_WavyLines.txt

@@ -1,6 +1,5 @@
 {
     "propertyLayout": {
-        "version": 1,
         "properties": {
             "general": [
                 {

Materials/HotReloadTest/TestData/VariantSelection_FullyBaked.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials/Types/StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/HotReloadTest/TestData/VariantSelection_Root.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials/Types/StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/MinimalPBR/MinimalPBR_BlueMetal.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "TestData/Materials/Types/MinimalPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "settings": {
             "color": [

Materials/MinimalPBR/MinimalPBR_Default.material

@@ -2,5 +2,5 @@
     "description": "",
     "materialType": "TestData/Materials/Types/MinimalPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3
+    "materialTypeVersion": 3
 }

Materials/MinimalPBR/MinimalPBR_RedDielectric.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "TestData/Materials/Types/MinimalPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "settings": {
             "color": [

Materials/SSRExample/Cube.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [
@@ -27,4 +27,4 @@
             "textureMap": "Textures/Default/default_roughness.tif"
         }
     }
-}
+}

Materials/SSRExample/GroundPlaneAluminum.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/SSRExample/GroundPlaneChrome.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/SSRExample/GroundPlaneWood.material

@@ -2,7 +2,7 @@
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "textureMap": "Materials/SSRExample/wood_planks_512_diff.tif"

Materials/SSRExample/ShaderBall.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "materialType": "Materials\\Types\\StandardPBR.materialtype",
-    "propertyLayoutVersion": 3,
+    "materialTypeVersion": 3,
     "properties": {
         "baseColor": {
             "color": [

Materials/TransparentDoubleSide.material

@@ -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",

Shaders/ComprehensiveTestMaterial/Comprehensive.materialtype

@@ -1,7 +1,7 @@
 {
     "description": "This material tests as many material system features as possible in one place. It splits an object into several stacks of slices, with each stack oscillating independently. This is achieved by rendering a separate pass for each stack, demonstrating multi-pass rendering. The stacks/passes can be disabled independently, demonstrating the ShaderCollectionFunctor feature. There is also a light source, which can be moved using angle values, and these values are converted to a direction vector before being sent to the shader, which demonstrates the use of a ShaderInputFunctor.",
+    "version": 1,
     "propertyLayout": {
-        "version": 1,
         "groups": [
             {
                 "id": "stacks",

Shaders/ComprehensiveTestMaterial/Comprehensive_variant.material

@@ -1,6 +1,6 @@
 {
     "materialType": "Comprehensive.materialtype",
-    "propertyLayoutVersion": 1,
+    "materialTypeVersion": 1,
     "properties": {
         "stacks": {
             "stackCount": 2,

Shaders/MaterialEditorTest.materialtype

@@ -1,7 +1,7 @@
 {
     "description": "Just collects some dummy fields for testing the material editor.",
+    "version": 1,
     "propertyLayout": {
-        "version": 1,
         "groups": [
             {
                 "id": "normal",

Shaders/MaterialEditorTest_default.material

@@ -1,6 +1,6 @@
 {
     "materialType": "MaterialEditorTest.materialtype",
-    "propertyLayoutVersion": 1,
+    "materialTypeVersion": 1,
     "properties": {
         "normal": {
             "myBool": false,