Merge branch 'main' into Atom/performance

Signed-off-by: Ken Pruiksma <[email protected]>

# Conflicts:
#	Project/Code/enabled_gems.cmake

Gems/ArchVis/Asset_License_CC-BY-NC-4.0.txt

@@ -0,0 +1,5 @@
+Loft Arch Vis Sample Assets
+Copyright 2022 Amazon.com, Inc. or its affiliates, all rights reserved.
+
+These asset files are licensed under a Creative Commons Attribution-NonCommercial 4.0 International License, available at http://creativecommons.org/licenses/by-nc/4.0/.
+

Gems/ArchVis/Assets/Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/Bar_Drop_Ceiling_Lights.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10d1e9d4d3362cf12ffc553a22e57c5a59da8bec474e5cfa452d9c5b1b73777e
-size 1770748
+oid sha256:9896a92e8edb30d0d6d9bd8a38ff7d2e669c310271607b17a887552fd9435794
+size 806700

Gems/ArchVis/Assets/Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/Bar_Drop_Ceiling_Lights_dropCeilingLightsMAT.material

@@ -1,6 +1,6 @@
 {
     "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialTypeVersion": 5,
     "propertyValues": {
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/textures/Bar_Drop_Ceiling_Lights_BaseColor.png",
@@ -13,7 +13,8 @@
         "emissive.enable": true,
         "emissive.intensity": 12.479999542236328,
         "emissive.textureMap": "Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/textures/Bar_Drop_Ceiling_Lights_Emissive.png",
-        "irradiance.color": [
+        "general.applySpecularAA": true,
+        "irradiance.manualColor": [
             0.07483019679784775,
             0.0619364008307457,
             0.02328529953956604,
@@ -22,6 +23,7 @@
         "metallic.textureMap": "Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/textures/Bar_Drop_Ceiling_Lights_Metallic.png",
         "normal.textureMap": "Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/textures/Bar_Drop_Ceiling_Lights_Normal.png",
         "opacity.factor": 1.0,
-        "roughness.textureMap": "Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/textures/Bar_Drop_Ceiling_Lights_Roughness.png"
+        "roughness.textureMap": "Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/textures/Bar_Drop_Ceiling_Lights_Roughness.png",
+        "specularF0.enableMultiScatterCompensation": true
     }
 }

Gems/ArchVis/Assets/Props/Bar_Drop_Ceiling_Lights_B071F6VV2T/bar_drop_ceiling_lights.prefab

@@ -35,10 +35,6 @@
                 "$type": "EditorVisibilityComponent",
                 "Id": 3772299976998754238
             },
-            "Component_[4237734388437842750]": {
-                "$type": "SelectionComponent",
-                "Id": 4237734388437842750
-            },
             "Component_[8510902484781513853]": {
                 "$type": "EditorLockComponent",
                 "Id": 8510902484781513853
@@ -69,6 +65,18 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3489381569
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{0151AD2E-440B-5C26-B11A-3D171A382FC1}"
+                                            }
+                                        }
+                                    }
+                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 3860263370
@@ -144,10 +152,6 @@
                         "LocallyEnabled": false
                     }
                 },
-                "Component_[4551598154706652079]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4551598154706652079
-                },
                 "Component_[5770119706861331530]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 5770119706861331530,

Gems/ArchVis/Assets/Props/Bar_Stool_B075YPTF9H/Bar_Stool.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db95abbc407c1d3ae8fe9c1390efa392525636db9abf5a5a53b32cc4e2a5be71
-size 582700
+oid sha256:94cd1e80399a78d7f609f01508f6a05342d14edf66722da96b0541b4c5d5dee1
+size 338220

Gems/ArchVis/Assets/Props/Bar_Stool_B075YPTF9H/Bar_Stool_bar_stoolMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,25 +10,17 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Bar_Stool_B075YPTF9H/textures/bar_stool_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
         "general.applySpecularAA": true,
         "irradiance.manualColor": [
             0.0,
-            0.5411612391471863,
-            0.7551079392433167,
+            0.5411611795425415,
+            0.7551078796386719,
             1.0
         ],
         "metallic.textureMap": "Props/Bar_Stool_B075YPTF9H/textures/bar_stool_Metallic.png",
         "normal.textureMap": "Props/Bar_Stool_B075YPTF9H/textures/bar_stool_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "Props/Bar_Stool_B075YPTF9H/textures/bar_stool_Roughness.png"
+        "roughness.textureMap": "Props/Bar_Stool_B075YPTF9H/textures/bar_stool_Roughness.png",
+        "specularF0.enableMultiScatterCompensation": true
     }
 }

Gems/ArchVis/Assets/Props/Bar_Stool_B075YPTF9H/bar_stool.prefab

@@ -20,10 +20,6 @@
                 "$type": "EditorOnlyEntityComponent",
                 "Id": 14907347293190168405
             },
-            "Component_[4163938183836954244]": {
-                "$type": "SelectionComponent",
-                "Id": 4163938183836954244
-            },
             "Component_[4567198759255416922]": {
                 "$type": "EditorLockComponent",
                 "Id": 4567198759255416922
@@ -108,10 +104,6 @@
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 11783200887630542331
                 },
-                "Component_[13317449770201607324]": {
-                    "$type": "SelectionComponent",
-                    "Id": 13317449770201607324
-                },
                 "Component_[1444637445411404547]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 1444637445411404547
@@ -159,6 +151,18 @@
                                             "assetHint": "props/bar_stool_b075yptf9h/bar_stool_bar_stoolmat.azmaterial"
                                         }
                                     }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2413745165
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{6B0C634A-93A6-5CC2-AFE1-536E33B70835}"
+                                            }
+                                        }
+                                    }
                                 }
                             ]
                         }

Gems/ArchVis/Assets/Props/Bathroom_Mirror_B07B92C9WT/Bathroom_Mirror_mirrorMAT.material

@@ -1,8 +1,8 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "properties": {
         "baseColor": {
             "color": [
@@ -13,23 +13,10 @@
             ],
             "textureBlendMode": "Lerp"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "factor": 1.0,
             "useTexture": false
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.0,
             "useTexture": false

Gems/ArchVis/Assets/Props/Bathroom_Mirror_B07B92C9WT/Bathroom_Mirror_mirror_frameMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,14 +10,6 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Bathroom_Mirror_B07B92C9WT/textures/bathroom_mirror_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
         "irradiance.color": [
             1.0,
             0.7066605687141418,
@@ -25,7 +17,6 @@
             1.0
         ],
         "metallic.useTexture": false,
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "Props/Bathroom_Mirror_B07B92C9WT/textures/bathroom_mirror_Roughness.png"
     }

Gems/ArchVis/Assets/Props/Bathroom_Sink_Cabinet/Bathroom_Sink_Cabinet_main.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5225216150283813,
@@ -8,13 +8,6 @@
             0.5225216150283813,
             1.0
         ],
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "opacity.factor": 1.0,
         "roughness.factor": 0.5799999833106995
     }
 }

Gems/ArchVis/Assets/Props/Bathroom_Sink_Cabinet/Bathroom_Sink_Cabinet_part1.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.0721006989479065,
@@ -8,12 +8,6 @@
             0.0721006989479065,
             1.0
         ],
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
         "general.applySpecularAA": true,
         "irradiance.color": [
             0.18367284536361694,
@@ -21,7 +15,6 @@
             0.1257190853357315,
             1.0
         ],
-        "opacity.factor": 1.0,
         "roughness.factor": 0.0
     }
 }

Gems/ArchVis/Assets/Props/Bathroom_Sink_Cabinet/Bathroom_Sink_Cabinet_part2.material

@@ -1,8 +1,7 @@
 {
     "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
     "properties": {
         "baseColor": {
             "color": [
@@ -12,20 +11,9 @@
                 1.0
             ]
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ]
-        },
         "metallic": {
             "factor": 1.0
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.3499999940395355
         }

Gems/ArchVis/Assets/Props/Bathroom_Sink_Cabinet/Bathroom_Sink_Cabinet_part3.material

@@ -1,8 +1,7 @@
 {
     "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
     "properties": {
         "baseColor": {
             "color": [
@@ -11,17 +10,6 @@
                 0.6187266707420349,
                 1.0
             ]
-        },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ]
-        },
-        "opacity": {
-            "factor": 1.0
         }
     }
 }

Gems/ArchVis/Assets/Props/Bathtub/Bathtub_tubMAT.material

@@ -16,16 +16,6 @@
         "clearCoat": {
             "enable": true
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "useTexture": false
         },

Gems/ArchVis/Assets/Props/Bathtub/Bathtub_tub_metalMAT.material

@@ -1,8 +1,8 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "properties": {
         "baseColor": {
             "color": [
@@ -13,23 +13,10 @@
             ],
             "textureBlendMode": "Lerp"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "factor": 1.0,
             "useTexture": false
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.209989994764328,
             "useTexture": false

Gems/ArchVis/Assets/Props/Bedroom_Night_Stand_B07374SBFM/Bedroom_Night_Stand_night_standMAT.material

@@ -1,18 +1,11 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Bedroom_Night_Stand_B07374SBFM/textures/night_stand_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
-        "irradiance.color": [
+        "general.applySpecularAA": true,
+        "irradiance.manualColor": [
             0.5170061588287354,
             0.3143358528614044,
             0.08271915465593338,
@@ -20,7 +13,6 @@
         ],
         "metallic.textureMap": "Props/Bedroom_Night_Stand_B07374SBFM/textures/night_stand_Metallic.png",
         "normal.textureMap": "Props/Bedroom_Night_Stand_B07374SBFM/textures/night_stand_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "Props/Bedroom_Night_Stand_B07374SBFM/textures/night_stand_Roughness.png"
     }

Gems/ArchVis/Assets/Props/Blinds/blinds_blindsMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,14 +10,6 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Rooms/Interior_02/textures/blinds_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
         "irradiance.color": [
             0.2585030794143677,
             0.21484702825546265,
@@ -26,7 +18,6 @@
         ],
         "metallic.textureMap": "Rooms/Interior_02/textures/blinds_Metallic.png",
         "normal.textureMap": "Rooms/Interior_02/textures/blinds_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "Rooms/Interior_02/textures/blinds_Roughness.png"
     }

Gems/ArchVis/Assets/Props/Book_ArtHouse/book_artHouse_book_artHouseMAT.material

@@ -1,41 +0,0 @@
-{
-    "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "parentMaterial": "",
-    "propertyLayoutVersion": 3,
-    "properties": {
-        "baseColor": {
-            "color": [
-                0.5,
-                0.5,
-                0.5,
-                1.0
-            ],
-            "textureBlendMode": "Lerp",
-            "textureMap": "Props/Book_ArtHouse/textures/book_artHouse_BaseColor.png"
-        },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
-        "metallic": {
-            "useTexture": false
-        },
-        "normal": {
-            "textureMap": "Props/Book_ArtHouse/textures/book_artHouse_Normal.png"
-        },
-        "opacity": {
-            "factor": 1.0
-        },
-        "roughness": {
-            "factor": 0.33000001311302187,
-            "textureMap": "Props/Book_ArtHouse/textures/book_artHouse_Roughness.png"
-        }
-    }
-}

Gems/ArchVis/Assets/Props/Book_ArtHouse/textures/book_artHouse_BaseColor.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:163093d42a247a0e102df75430a5801f92a82810621f59d90fd135685e92b059
-size 7189636

Gems/ArchVis/Assets/Props/Book_BucketList/textures/book_bucketList_BaseColor.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47079421f7564e8dedb88832f2cbb292db38217ff5fd5525966eb3839de2e6bf
-size 6973839

Gems/ArchVis/Assets/Props/Book_ElementsOfStyle/book_elementsOfStyle_book_ElementsOfStyleMAT.material

@@ -1,41 +0,0 @@
-{
-    "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "parentMaterial": "",
-    "propertyLayoutVersion": 3,
-    "properties": {
-        "baseColor": {
-            "color": [
-                0.5,
-                0.5,
-                0.5,
-                1.0
-            ],
-            "textureBlendMode": "Lerp",
-            "textureMap": "Props/Book_ElementsOfStyle/textures/book_ElementsOfStyle_BaseColor.png"
-        },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
-        "metallic": {
-            "useTexture": false
-        },
-        "normal": {
-            "textureMap": "Props/Book_ElementsOfStyle/textures/book_ElementsOfStyle_Normal.png"
-        },
-        "opacity": {
-            "factor": 1.0
-        },
-        "roughness": {
-            "factor": 0.33000001311302187,
-            "textureMap": "Props/Book_ElementsOfStyle/textures/book_ElementsOfStyle_Roughness.png"
-        }
-    }
-}

Gems/ArchVis/Assets/Props/Book_ElementsOfStyle/textures/book_ElementsOfStyle_BaseColor.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9f1e1dff37588730e5027161ba8284aedfdc27ba4b296661d85815b3b9dc2c9
-size 8222089

Gems/ArchVis/Assets/Props/Book_ElementsOfStyle/book_ElementsOfStyle.prefab → Gems/ArchVis/Assets/Props/Book_Four/book_four.prefab

@@ -1,7 +1,7 @@
 {
     "ContainerEntity": {
         "Id": "ContainerEntity",
-        "Name": "book_ElementsOfStyle",
+        "Name": "book_four",
         "Components": {
             "Component_[10078690463960964188]": {
                 "$type": "EditorLockComponent",
@@ -53,7 +53,7 @@
     "Entities": {
         "Entity_[1711098252298]": {
             "Id": "Entity_[1711098252298]",
-            "Name": "book_ElementsOfStyle",
+            "Name": "book_four",
             "Components": {
                 "Component_[10146371728887363339]": {
                     "$type": "EditorPendingCompositionComponent",
@@ -95,7 +95,7 @@
                                             "assetId": {
                                                 "guid": "{E84BBE90-EFA9-5A5F-A6B8-77B4D77E5457}"
                                             },
-                                            "assetHint": "props/book_elementsofstyle/book_elementsofstyle_book_elementsofstylemat.azmaterial"
+                                            "assetHint": "props/book_four/book_four_book_fourmat.azmaterial"
                                         }
                                     }
                                 }
@@ -111,7 +111,7 @@
                                 "assetId": {
                                     "guid": "{E84BBE90-EFA9-5A5F-A6B8-77B4D77E5457}"
                                 },
-                                "assetHint": "props/book_elementsofstyle/book_elementsofstyle_book_elementsofstylemat.azmaterial"
+                                "assetHint": "props/book_four/book_four_book_fourmat.azmaterial"
                             },
                             "defaultMaterialAsset": {
                                 "assetId": {
@@ -119,7 +119,7 @@
                                     "subId": 3332642883
                                 },
                                 "loadBehavior": "PreLoad",
-                                "assetHint": "props/book_elementsofstyle/book_elementsofstyle_book_elementsofstylemat_15613339261219379267.azmaterial"
+                                "assetHint": "props/book_four/book_four_book_fourmat_15613339261219379267.azmaterial"
                             }
                         }
                     ],
@@ -136,7 +136,7 @@
                                         "subId": 3332642883
                                     },
                                     "loadBehavior": "PreLoad",
-                                    "assetHint": "props/book_elementsofstyle/book_elementsofstyle_book_elementsofstylemat_15613339261219379267.azmaterial"
+                                    "assetHint": "props/book_four/book_four_book_fourmat_15613339261219379267.azmaterial"
                                 }
                             }
                         ]
@@ -181,7 +181,7 @@
                                     "guid": "{DCD8B53E-9993-5608-B75C-248C61F32163}",
                                     "subId": 270919028
                                 },
-                                "assetHint": "props/book_elementsofstyle/book_elementsofstyle.azmodel"
+                                "assetHint": "props/book_four/book_four.azmodel"
                             }
                         }
                     }

Gems/ArchVis/Assets/Props/Book_Four/book_four_book_fourMAT.material

@@ -0,0 +1,27 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "parentMaterial": "",
+    "properties": {
+        "baseColor": {
+            "color": [
+                0.5,
+                0.5,
+                0.5,
+                1.0
+            ],
+            "textureBlendMode": "Lerp",
+            "textureMap": "Props/Book_four/textures/book_four_BaseColor.png"
+        },
+        "metallic": {
+            "useTexture": false
+        },
+        "normal": {
+            "textureMap": "Props/Book_four/textures/book_four_Normal.png"
+        },
+        "roughness": {
+            "factor": 0.33000001311302187,
+            "textureMap": "Props/Book_four/textures/book_four_Roughness.png"
+        }
+    }
+}

Gems/ArchVis/Assets/Props/Book_Four/textures/book_four_BaseColor.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:040847f0ce8068dacfaf2d51b463e50493ec543a29d18f49901378ec225f508d
+size 2578417

Gems/ArchVis/Assets/Props/Book_Mondo/book_mondo_book_mondoMAT.material

@@ -1,41 +0,0 @@
-{
-    "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "parentMaterial": "",
-    "propertyLayoutVersion": 3,
-    "properties": {
-        "baseColor": {
-            "color": [
-                0.5,
-                0.5,
-                0.5,
-                1.0
-            ],
-            "textureBlendMode": "Lerp",
-            "textureMap": "Props/Book_Mondo/textures/book_mondo_BaseColor.png"
-        },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
-        "metallic": {
-            "useTexture": false
-        },
-        "normal": {
-            "textureMap": "Props/Book_Mondo/textures/book_mondo_Normal.png"
-        },
-        "opacity": {
-            "factor": 1.0
-        },
-        "roughness": {
-            "factor": 0.33000001311302187,
-            "textureMap": "Props/Book_Mondo/textures/book_mondo_Roughness.png"
-        }
-    }
-}

Gems/ArchVis/Assets/Props/Book_Mondo/textures/book_mondo_BaseColor.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98ebb50158a0f231d70026c0a442c71d3da459daaf256faa1633c5c4e46ebb73
-size 8818641

Gems/ArchVis/Assets/Props/Book_ArtHouse/book_arthouse.prefab → Gems/ArchVis/Assets/Props/Book_One/book_one.prefab

@@ -1,7 +1,7 @@
 {
     "ContainerEntity": {
         "Id": "ContainerEntity",
-        "Name": "book_arthouse",
+        "Name": "book_one",
         "Components": {
             "Component_[10371841166258004592]": {
                 "$type": "EditorLockComponent",
@@ -53,7 +53,7 @@
     "Entities": {
         "Entity_[405428194314]": {
             "Id": "Entity_[405428194314]",
-            "Name": "book_arthouse",
+            "Name": "book_one",
             "Components": {
                 "Component_[10287963362625554519]": {
                     "$type": "SelectionComponent",
@@ -86,7 +86,7 @@
                                     "guid": "{53495A75-C3B6-58EF-B9D1-65AE801CAE0F}",
                                     "subId": 271526208
                                 },
-                                "assetHint": "props/book_arthouse/book_arthouse.azmodel"
+                                "assetHint": "props/book_one/book_one.azmodel"
                             }
                         }
                     }
@@ -114,7 +114,7 @@
                                             "assetId": {
                                                 "guid": "{D1C5786E-65A1-5AC7-AB11-D5291F4F0C2A}"
                                             },
-                                            "assetHint": "props/book_arthouse/book_arthouse_book_arthousemat.azmaterial"
+                                            "assetHint": "props/book_one/book_one_book_onemat.azmaterial"
                                         }
                                     }
                                 }
@@ -130,7 +130,7 @@
                                 "assetId": {
                                     "guid": "{D1C5786E-65A1-5AC7-AB11-D5291F4F0C2A}"
                                 },
-                                "assetHint": "props/book_arthouse/book_arthouse_book_arthousemat.azmaterial"
+                                "assetHint": "props/book_one/book_one_book_onemat.azmaterial"
                             },
                             "defaultMaterialAsset": {
                                 "assetId": {
@@ -138,7 +138,7 @@
                                     "subId": 3245953667
                                 },
                                 "loadBehavior": "PreLoad",
-                                "assetHint": "props/book_arthouse/book_arthouse_book_arthousemat_9747349833940292227.azmaterial"
+                                "assetHint": "props/book_one/book_one_book_onemat_9747349833940292227.azmaterial"
                             }
                         }
                     ],
@@ -155,7 +155,7 @@
                                         "subId": 3245953667
                                     },
                                     "loadBehavior": "PreLoad",
-                                    "assetHint": "props/book_arthouse/book_arthouse_book_arthousemat_9747349833940292227.azmaterial"
+                                    "assetHint": "props/book_one/book_one_book_onemat_9747349833940292227.azmaterial"
                                 }
                             }
                         ]

Gems/ArchVis/Assets/Props/Book_One/book_one_book_oneMAT.material

@@ -0,0 +1,27 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "parentMaterial": "",
+    "properties": {
+        "baseColor": {
+            "color": [
+                0.5,
+                0.5,
+                0.5,
+                1.0
+            ],
+            "textureBlendMode": "Lerp",
+            "textureMap": "Props/Book_one/textures/book_one_BaseColor.png"
+        },
+        "metallic": {
+            "useTexture": false
+        },
+        "normal": {
+            "textureMap": "Props/Book_one/textures/book_one_Normal.png"
+        },
+        "roughness": {
+            "factor": 0.33000001311302187,
+            "textureMap": "Props/Book_one/textures/book_one_Roughness.png"
+        }
+    }
+}

Gems/ArchVis/Assets/Props/Book_One/textures/book_one_BaseColor.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75e5a13feb97c7038928504caaabd35006fe12218c56d2a01f19b3bcf8ee47a0
+size 2610461

Gems/ArchVis/Assets/Props/Book_Mondo/book_Mondo.prefab → Gems/ArchVis/Assets/Props/Book_Three/book_three.prefab

@@ -1,7 +1,7 @@
 {
     "ContainerEntity": {
         "Id": "ContainerEntity",
-        "Name": "book_Mondo",
+        "Name": "book_three",
         "Components": {
             "Component_[10916027984662429230]": {
                 "$type": "EditorDisabledCompositionComponent",
@@ -53,7 +53,7 @@
     "Entities": {
         "Entity_[2016040930314]": {
             "Id": "Entity_[2016040930314]",
-            "Name": "book_Mondo",
+            "Name": "book_three",
             "Components": {
                 "Component_[10190338524934163834]": {
                     "$type": "EditorInspectorComponent",
@@ -104,7 +104,7 @@
                                             "assetId": {
                                                 "guid": "{5F0E79BD-7708-5BE1-839E-9FD7114575F0}"
                                             },
-                                            "assetHint": "props/book_mondo/book_mondo_book_mondomat.azmaterial"
+                                            "assetHint": "props/book_three/book_three_book_threemat.azmaterial"
                                         }
                                     }
                                 }
@@ -120,7 +120,7 @@
                                 "assetId": {
                                     "guid": "{5F0E79BD-7708-5BE1-839E-9FD7114575F0}"
                                 },
-                                "assetHint": "props/book_mondo/book_mondo_book_mondomat.azmaterial"
+                                "assetHint": "props/book_three/book_three_book_threemat.azmaterial"
                             },
                             "defaultMaterialAsset": {
                                 "assetId": {
@@ -128,7 +128,7 @@
                                     "subId": 1924340936
                                 },
                                 "loadBehavior": "PreLoad",
-                                "assetHint": "props/book_mondo/book_mondo_book_mondomat_2540930683194514632.azmaterial"
+                                "assetHint": "props/book_three/book_three_book_threemat_2540930683194514632.azmaterial"
                             }
                         }
                     ],
@@ -145,7 +145,7 @@
                                         "subId": 1924340936
                                     },
                                     "loadBehavior": "PreLoad",
-                                    "assetHint": "props/book_mondo/book_mondo_book_mondomat_2540930683194514632.azmaterial"
+                                    "assetHint": "props/book_three/book_three_book_threemat_2540930683194514632.azmaterial"
                                 }
                             }
                         ]
@@ -169,7 +169,7 @@
                                     "guid": "{52D2BFD5-1C97-5AEB-9A60-31430B6C169C}",
                                     "subId": 282231437
                                 },
-                                "assetHint": "props/book_mondo/book_mondo.azmodel"
+                                "assetHint": "props/book_three/book_three.azmodel"
                             }
                         }
                     }

Gems/ArchVis/Assets/Props/Book_Three/book_three_book_threeMAT.material

@@ -0,0 +1,27 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "parentMaterial": "",
+    "properties": {
+        "baseColor": {
+            "color": [
+                0.5,
+                0.5,
+                0.5,
+                1.0
+            ],
+            "textureBlendMode": "Lerp",
+            "textureMap": "Props/Book_three/textures/book_three_BaseColor.png"
+        },
+        "metallic": {
+            "useTexture": false
+        },
+        "normal": {
+            "textureMap": "Props/Book_three/textures/book_three_Normal.png"
+        },
+        "roughness": {
+            "factor": 0.33000001311302187,
+            "textureMap": "Props/Book_three/textures/book_three_Roughness.png"
+        }
+    }
+}

Gems/ArchVis/Assets/Props/Book_Three/textures/book_three_BaseColor.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8baec6040f7af2bbc764bd3682e9288fa6305e324768b83ae96da04aae2854d2
+size 5244093

Gems/ArchVis/Assets/Props/Book_BucketList/book_bucketList.prefab → Gems/ArchVis/Assets/Props/Book_Two/book_two.prefab

@@ -1,7 +1,7 @@
 {
     "ContainerEntity": {
         "Id": "ContainerEntity",
-        "Name": "book_bucketList",
+        "Name": "book_two",
         "Components": {
             "Component_[10447685532499203772]": {
                 "$type": "EditorInspectorComponent",
@@ -53,7 +53,7 @@
     "Entities": {
         "Entity_[607291657226]": {
             "Id": "Entity_[607291657226]",
-            "Name": "book_bucketList",
+            "Name": "book_two",
             "Components": {
                 "Component_[11296872188689898055]": {
                     "$type": "EditorOnlyEntityComponent",
@@ -77,7 +77,7 @@
                                     "guid": "{246EC4E7-8CF3-5B22-A0C5-9640B0FDE0CF}",
                                     "subId": 271790263
                                 },
-                                "assetHint": "props/book_bucketlist/book_bucketlist.azmodel"
+                                "assetHint": "props/book_two/book_two.azmodel"
                             }
                         }
                     }
@@ -134,7 +134,7 @@
                                     "subId": 4147083583
                                 },
                                 "loadBehavior": "PreLoad",
-                                "assetHint": "props/book_bucketlist/book_bucketlist_book_bucketlistmat_2587307407272016191.azmaterial"
+                                "assetHint": "props/book_two/book_two_book_twomat_2587307407272016191.azmaterial"
                             }
                         }
                     ],
@@ -151,7 +151,7 @@
                                         "subId": 4147083583
                                     },
                                     "loadBehavior": "PreLoad",
-                                    "assetHint": "props/book_bucketlist/book_bucketlist_book_bucketlistmat_2587307407272016191.azmaterial"
+                                    "assetHint": "props/book_two/book_two_book_twomat_2587307407272016191.azmaterial"
                                 }
                             }
                         ]

Gems/ArchVis/Assets/Props/Book_Two/textures/book_two_BaseColor.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ea069c143650a129b928b3bc9a8fa0220416e250ab0a77349fd031998c227d3
+size 2530189

Gems/ArchVis/Assets/Props/Cabinet_B07HSDP2CP/Cabinet.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df5618408b0ef03f9bac6a16c8f4c1a7edd39bfd1c328006e9ab663cf670d6b8
-size 270140
+oid sha256:9233f224ed954a39f162d5167507bfd0dd4b850de50ab893ff83bdcdf8c6346b
+size 243996

Gems/ArchVis/Assets/Props/Cabinet_B07HSDP2CP/Cabinet_cabinetMAT.material

@@ -1,24 +1,18 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Cabinet_B07HSDP2CP/textures/cabinet_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "irradiance.color": [
+        "general.applySpecularAA": true,
+        "irradiance.manualColor": [
             0.7755092978477478,
-            0.4720836281776428,
-            0.29642176628112793,
+            0.47208359837532043,
+            0.2964217960834503,
             1.0
         ],
         "metallic.textureMap": "Props/Cabinet_B07HSDP2CP/textures/cabinet_Metallic.png",
         "normal.textureMap": "Props/Cabinet_B07HSDP2CP/textures/cabinet_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.textureMap": "Props/Cabinet_B07HSDP2CP/textures/cabinet_Roughness.png"
     }
 }

Gems/ArchVis/Assets/Props/Cabinet_B07HSDP2CP/cabinet.prefab

@@ -19,10 +19,6 @@
                 "$type": "EditorEntitySortComponent",
                 "Id": 13645401104273913245
             },
-            "Component_[14185625865942601991]": {
-                "$type": "SelectionComponent",
-                "Id": 14185625865942601991
-            },
             "Component_[15430954722542901566]": {
                 "$type": "EditorPrefabComponent",
                 "Id": 15430954722542901566
@@ -85,6 +81,18 @@
                                             "assetHint": "props/cabinet_b07hsdp2cp/cabinet_cabinetmat.azmaterial"
                                         }
                                     }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2699421586
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{E28F6129-B21E-5397-A4FA-4532BB6CEF31}"
+                                            }
+                                        }
+                                    }
                                 }
                             ]
                         }
@@ -163,10 +171,6 @@
                         ]
                     }
                 },
-                "Component_[5029916194744260314]": {
-                    "$type": "SelectionComponent",
-                    "Id": 5029916194744260314
-                },
                 "Component_[6146282381681623245]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 6146282381681623245

Gems/ArchVis/Assets/Props/CandlesAndShakers/candlesAndShakers_candlesAndShakersMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/CandlesAndShakers/textures/candlesAndShakers_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "textureMap": "Props/CandlesAndShakers/textures/candlesAndShakers_Metallic.png"
         },
         "normal": {
             "textureMap": "Props/CandlesAndShakers/textures/candlesAndShakers_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/CandlesAndShakers/textures/candlesAndShakers_Roughness.png"

Gems/ArchVis/Assets/Props/CeilingFan/ceilingFan_ceilingFanMAT.material

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

Gems/ArchVis/Assets/Props/Chair_B082VM23MF/Chair.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87e63db3f70ad3a4e542da15a100b1b56242f2c0c5ffb4ca9bf4926b0523ba45
-size 5010796
+oid sha256:e4d64aeaba7eb669cde3dbfbf512cce031993803d5780c910642b5f85deb0d6c
+size 3606188

Gems/ArchVis/Assets/Props/Chair_B082VM23MF/Chair_chairMAT.material

@@ -1,6 +1,6 @@
 {
     "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialTypeVersion": 5,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,18 +10,10 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Chair_B082VM23MF/textures/chairMAT_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
         "general.applySpecularAA": true,
-        "irradiance.color": [
+        "irradiance.manualColor": [
             0.0,
-            0.383337140083313,
+            0.3833371102809906,
             1.0,
             1.0
         ],

Gems/ArchVis/Assets/Props/Chair_B082VM23MF/Chair_pillowMAT.material

@@ -1,6 +1,6 @@
 {
     "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialTypeVersion": 5,
     "propertyValues": {
         "baseColor.color": [
             0.1412658989429474,
@@ -18,7 +18,8 @@
         ],
         "emissive.intensity": 0.0,
         "emissive.useTexture": false,
-        "irradiance.color": [
+        "general.applySpecularAA": true,
+        "irradiance.manualColor": [
             0.8231326937675476,
             0.732402503490448,
             0.14267189800739288,

Gems/ArchVis/Assets/Props/Chair_B082VM23MF/chair.prefab

@@ -40,10 +40,6 @@
                 "$type": "EditorOnlyEntityComponent",
                 "Id": 670345798098463884
             },
-            "Component_[7123431047274749154]": {
-                "$type": "SelectionComponent",
-                "Id": 7123431047274749154
-            },
             "Component_[928576198217393780]": {
                 "$type": "EditorPrefabComponent",
                 "Id": 928576198217393780
@@ -59,10 +55,6 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 1223936186271531899
                 },
-                "Component_[12459741027185271939]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12459741027185271939
-                },
                 "Component_[12652173119112881554]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 12652173119112881554,
@@ -189,6 +181,18 @@
                                         }
                                     }
                                 },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2932225145
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{178EC5F9-F66D-5A23-BAE9-ACF9B6C9B16C}"
+                                            }
+                                        }
+                                    }
+                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 3149940221
@@ -201,6 +205,19 @@
                                             "assetHint": "props/chair_b082vm23mf/chair_pillowmat.azmaterial"
                                         }
                                     }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3389794772
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{86CCDC2B-DD2B-5E1E-A152-EDD2404B41FF}"
+                                            },
+                                            "assetHint": "props/chair_b082vm23mf/chair_chairmat.azmaterial"
+                                        }
+                                    }
                                 }
                             ]
                         }

Gems/ArchVis/Assets/Props/Computer_Desk_B075ZBVZST/Computer_Desk.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de3191792fcfc0ef28e1ccb9f3755976d443a30e6ef0e841ba2cf0dfeb039621
-size 409308
+oid sha256:b50656eafede358db48e54df4d23e498e88f39b7ac462f57e3f229d72ea871b6
+size 292700

Gems/ArchVis/Assets/Props/Computer_Desk_B075ZBVZST/Computer_Desk_computerDeskMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,23 +10,14 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Computer_Desk_B075ZBVZST/textures/computerDesk_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
-        "irradiance.color": [
-            0.3537346422672272,
-            0.20962844789028168,
-            0.007858396507799625,
+        "irradiance.manualColor": [
+            0.3537346124649048,
+            0.2096284031867981,
+            0.007858400233089924,
             1.0
         ],
         "metallic.textureMap": "Props/Computer_Desk_B075ZBVZST/textures/computerDesk_Metallic.png",
         "normal.textureMap": "Props/Computer_Desk_B075ZBVZST/textures/computerDesk_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "Props/Computer_Desk_B075ZBVZST/textures/computerDesk_Roughness.png"
     }

Gems/ArchVis/Assets/Props/Computer_Desk_B075ZBVZST/computer_desk.prefab

@@ -19,10 +19,6 @@
                 "$type": "EditorEntityIconComponent",
                 "Id": 18185968106047180993
             },
-            "Component_[1934981118639607512]": {
-                "$type": "SelectionComponent",
-                "Id": 1934981118639607512
-            },
             "Component_[4579497820762232178]": {
                 "$type": "EditorPendingCompositionComponent",
                 "Id": 4579497820762232178
@@ -67,10 +63,6 @@
                         ]
                     }
                 },
-                "Component_[138902228057552418]": {
-                    "$type": "SelectionComponent",
-                    "Id": 138902228057552418
-                },
                 "Component_[1490226298353474638]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 1490226298353474638
@@ -111,6 +103,24 @@
                                                 "guid": "{9AB497BE-8748-53DC-AE61-3BC92E87C3B0}"
                                             },
                                             "assetHint": "props/computer_desk_b075zbvzst/computer_desk_computerdeskmat.azmaterial"
+                                        },
+                                        "PropertyOverrides": {
+                                            "general.applySpecularAA": {
+                                                "$type": "bool",
+                                                "Value": false
+                                            }
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2830548440
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{9AB497BE-8748-53DC-AE61-3BC92E87C3B0}"
+                                            }
                                         }
                                     }
                                 }

Gems/ArchVis/Assets/Props/CuttingBoard/cuttingBoard_cuttingBoardMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,22 +14,9 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/CuttingBoard/textures/cuttingBoard_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "normal": {
             "textureMap": "Props/CuttingBoard/textures/cuttingBoard_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/CuttingBoard/textures/cuttingBoard_Roughness.png"

Gems/ArchVis/Assets/Props/CuttingBoard/cuttingBoard_knifeMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/CuttingBoard/textures/knife_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "textureMap": "Props/CuttingBoard/textures/knife_Metallic.png"
         },
         "normal": {
             "textureMap": "Props/CuttingBoard/textures/knife_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/CuttingBoard/textures/knife_Roughness.png"

Gems/ArchVis/Assets/Props/CuttingBoard/cuttingBoard_slicedAppleMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,22 +14,9 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/CuttingBoard/textures/slicedApple_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "normal": {
             "textureMap": "Props/CuttingBoard/textures/slicedApple_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/CuttingBoard/textures/slicedApple_Roughness.png"

Gems/ArchVis/Assets/Props/Decor_Bench_B082QD7WY8/Decor_Bench.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:610aae7e9a06ff7f8a452c8759ccfcffe2d5617803438384f61359101a6b412c
-size 3374684
+oid sha256:614b8d700187eb76a1e4efaae86eedf68ba44ee4cddee052b5d4d00e65fca0d4
+size 2216108

Gems/ArchVis/Assets/Props/Decor_Bench_B082QD7WY8/Decor_Bench_decorBenchMAT.material

@@ -1,18 +1,18 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Decor_Bench_B082QD7WY8/textures/decorBench_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
+        "general.applySpecularAA": true,
+        "irradiance.manualColor": [
+            0.24313725531101227,
+            0.22745098173618317,
+            0.2078431397676468,
             1.0
         ],
         "metallic.textureMap": "Props/Decor_Bench_B082QD7WY8/textures/decorBench_Metallic.png",
         "normal.textureMap": "Props/Decor_Bench_B082QD7WY8/textures/decorBench_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.textureMap": "Props/Decor_Bench_B082QD7WY8/textures/decorBench_Roughness.png"
     }
 }

Gems/ArchVis/Assets/Props/Decor_Bench_B082QD7WY8/decor_bench.prefab

@@ -19,10 +19,6 @@
                 "$type": "EditorVisibilityComponent",
                 "Id": 2380743057371333544
             },
-            "Component_[2605043769811221043]": {
-                "$type": "SelectionComponent",
-                "Id": 2605043769811221043
-            },
             "Component_[4243842774426780688]": {
                 "$type": "EditorLockComponent",
                 "Id": 4243842774426780688
@@ -105,10 +101,6 @@
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 15031657690000441560
                 },
-                "Component_[16677456497736923559]": {
-                    "$type": "SelectionComponent",
-                    "Id": 16677456497736923559
-                },
                 "Component_[18181312073938036063]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 18181312073938036063,
@@ -156,6 +148,18 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 566458547
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{2161B00F-FEE6-52FC-8E91-50FA1C8B8C3A}"
+                                            }
+                                        }
+                                    }
+                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 1877950487

Gems/ArchVis/Assets/Props/Dinner_Table_B075YP4WYT/Dinner_Table.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15ec232039fe7f58f07af88890c30c96b9d58e0bddc2ba9e1e72f36a9a6f01ce
-size 409436
+oid sha256:1d4b60e800fecae30c5f431ba3ff95a501d82147dcbb9d8fd208c686cbbe0b15
+size 411148

Gems/ArchVis/Assets/Props/Dinner_Table_B075YP4WYT/Dinner_Table_dinnerTableMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,24 +10,19 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Dinner_Table_B075YP4WYT/textures/dinnerTable_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
-        "irradiance.color": [
+        "general.applySpecularAA": true,
+        "irradiance.irradianceColorSource": "BaseColor",
+        "irradiance.manualColor": [
             0.687067985534668,
-            0.43566033244132996,
-            0.29010453820228577,
+            0.43566030263900757,
+            0.2901045083999634,
             1.0
         ],
         "metallic.textureMap": "Props/Dinner_Table_B075YP4WYT/textures/dinnerTable_Metallic.png",
         "normal.textureMap": "Props/Dinner_Table_B075YP4WYT/textures/dinnerTable_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "Props/Dinner_Table_B075YP4WYT/textures/dinnerTable_Roughness.png"
+        "roughness.textureMap": "Props/Dinner_Table_B075YP4WYT/textures/dinnerTable_Roughness.png",
+        "roughness.upperBound": 0.4000000059604645,
+        "specularF0.factor": 0.3799999952316284
     }
 }

Gems/ArchVis/Assets/Props/Dinner_Table_B075YP4WYT/dinner_table.prefab

@@ -12,10 +12,6 @@
                 "Id": 11662041448690944048,
                 "Parent Entity": ""
             },
-            "Component_[11951224443844728986]": {
-                "$type": "SelectionComponent",
-                "Id": 11951224443844728986
-            },
             "Component_[12576180100867331606]": {
                 "$type": "EditorEntitySortComponent",
                 "Id": 12576180100867331606
@@ -93,6 +89,19 @@
                                             "assetHint": "props/dinner_table_b075yp4wyt/dinner_table_dinnertablemat.azmaterial"
                                         }
                                     }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3614396697
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{B495B6C3-9B56-543E-B89B-092025EC6764}"
+                                            },
+                                            "assetHint": "props/dinner_table_b075yp4wyt/dinner_table_dinnertablemat.azmaterial"
+                                        }
+                                    }
                                 }
                             ]
                         }
@@ -132,10 +141,6 @@
                         }
                     ]
                 },
-                "Component_[4285561197151937255]": {
-                    "$type": "SelectionComponent",
-                    "Id": 4285561197151937255
-                },
                 "Component_[6842166626713226172]": {
                     "$type": "EditorOnlyEntityComponent",
                     "Id": 6842166626713226172

Gems/ArchVis/Assets/Props/Dinner_Table_Ceiling_Light/Dinner_Table_Ceiling_Light_ceilingLightBaseMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,25 +10,17 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Dinner_Table_Ceiling_Light/textures/ceilingLight_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
-        "irradiance.irradianceColorSource": "Manual",
+        "general.applySpecularAA": true,
         "irradiance.manualColor": [
             1.0,
-            0.8215762376785278,
+            0.8215761780738831,
             0.5400015115737915,
             1.0
         ],
         "metallic.textureMap": "Props/Dinner_Table_Ceiling_Light/textures/ceilingLight_Metallic.png",
         "normal.textureMap": "Props/Dinner_Table_Ceiling_Light/textures/ceilingLight_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "Props/Dinner_Table_Ceiling_Light/textures/ceilingLight_Roughness.png"
+        "roughness.textureMap": "Props/Dinner_Table_Ceiling_Light/textures/ceilingLight_Roughness.png",
+        "specularF0.enableMultiScatterCompensation": true
     }
 }

Gems/ArchVis/Assets/Props/Dinner_Table_Ceiling_Light/Dinner_Table_Ceiling_Light_ceilingLightGlassMAT.material

@@ -1,6 +1,6 @@
 {
     "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialTypeVersion": 5,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -22,6 +22,7 @@
         "metallic.useTexture": false,
         "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
-        "roughness.useTexture": false
+        "roughness.useTexture": false,
+        "specularF0.enableMultiScatterCompensation": true
     }
 }

Gems/ArchVis/Assets/Props/Dinner_Table_Floor_Rug/Dinner_Table_Floor_Rug_rugMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,15 +10,8 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Dinner_Table_Floor_Rug/textures/rug_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
-        "irradiance.color": [
+        "general.applySpecularAA": true,
+        "irradiance.manualColor": [
             0.8231326937675476,
             0.6950942277908325,
             0.548760175704956,
@@ -26,7 +19,6 @@
         ],
         "metallic.textureMap": "Props/Dinner_Table_Floor_Rug/textures/rug_Metallic.png",
         "normal.textureMap": "Props/Dinner_Table_Floor_Rug/textures/rug_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "Props/Dinner_Table_Floor_Rug/textures/rug_Roughness.png"
     }

Gems/ArchVis/Assets/Props/Dresser/Dresser_dresserMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/Dresser/textures/dresser_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "textureMap": "Props/Dresser/textures/dresser_Metallic.png"
         },
         "normal": {
             "textureMap": "Props/Dresser/textures/dresser_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/Dresser/textures/dresser_Roughness.png"

Gems/ArchVis/Assets/Props/End_Table_B072ZLCB32/End_Table.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e80fa8c793d356398f0d1592060adc61ad96118b96d297e4cd4bec6ce1acdce7
-size 164684
+oid sha256:fbacc0bbbd2c424ccec8d4ed1a05e883bb68bd03e020c3e121c4bc6432b5f9dc
+size 123532

Gems/ArchVis/Assets/Props/End_Table_B072ZLCB32/End_Table_endtableMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,14 +10,6 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/End_Table_B072ZLCB32/textures/endTable_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
         "irradiance.color": [
             0.7823147773742676,
             0.6022125482559204,
@@ -26,7 +18,6 @@
         ],
         "metallic.textureMap": "Props/End_Table_B072ZLCB32/textures/endTable_Metallic.png",
         "normal.textureMap": "Props/End_Table_B072ZLCB32/textures/endTable_Normal.png",
-        "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "Props/End_Table_B072ZLCB32/textures/endTable_Roughness.png",
         "roughness.useTexture": false

Gems/ArchVis/Assets/Props/End_Table_B072ZLCB32/end_table.prefab

@@ -11,10 +11,6 @@
                 "$type": "EditorLockComponent",
                 "Id": 11545497849542012357
             },
-            "Component_[12445186235493827368]": {
-                "$type": "SelectionComponent",
-                "Id": 12445186235493827368
-            },
             "Component_[1379112263293247270]": {
                 "$type": "EditorEntitySortComponent",
                 "Id": 1379112263293247270
@@ -63,10 +59,6 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 12278926135034944500
                 },
-                "Component_[12936060579598020300]": {
-                    "$type": "SelectionComponent",
-                    "Id": 12936060579598020300
-                },
                 "Component_[13776324375945566753]": {
                     "$type": "EditorInspectorComponent",
                     "Id": 13776324375945566753,
@@ -169,6 +161,18 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 1716906218
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{33BB593B-D558-5164-B274-51E420E771EA}"
+                                            }
+                                        }
+                                    }
+                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 4154642210

Gems/ArchVis/Assets/Props/FigTree/figTree_figTreeMAT.material

@@ -1,8 +1,7 @@
 {
     "description": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "parentMaterial": "",
-    "propertyLayoutVersion": 3,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,26 +13,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Rooms/Interior_02/textures/figTree_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "textureMap": "Rooms/Interior_02/textures/figTree_Emissive_Transmissive.png",
-            "useTexture": false
-        },
         "metallic": {
             "useTexture": false
         },
         "normal": {
             "textureMap": "Rooms/Interior_02/textures/figTree_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302187,
             "textureMap": "Rooms/Interior_02/textures/figTree_Roughness.png"

Gems/ArchVis/Assets/Props/FlatScreenTelevision/Flat_Screen_Television_remoteControlMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/FlatScreenTelevision/textures/remoteControl_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "useTexture": false
         },
         "normal": {
             "textureMap": "Props/FlatScreenTelevision/textures/remoteControl_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/FlatScreenTelevision/textures/remoteControl_Roughness.png"

Gems/ArchVis/Assets/Props/FlatScreenTelevision/Flat_Screen_Television_televisionMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,22 +14,9 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/FlatScreenTelevision/textures/television_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "useTexture": false
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/FlatScreenTelevision/textures/television_Roughness.png"

Gems/ArchVis/Assets/Props/FloorLamp/floorLamp_floorLampMAT.material

@@ -30,9 +30,6 @@
         "normal": {
             "textureMap": "Props/FloorLamp/textures/floorLamp_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/FloorLamp/textures/floorLamp_Roughness.png"

Gems/ArchVis/Assets/Props/Floor_Rug_B0732L974X/Rug.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a52536a8dc77ee9de461ccf10defb12f80b5df069717b3e4f5b88b5677e3050
-size 161788
+oid sha256:13e975e4650174f8d0c68570572827b7dd7d306e4224f8cbe6ebb867ccd06511
+size 76940

Gems/ArchVis/Assets/Props/Floor_Rug_B0732L974X/Rug_rugMAT.material

@@ -1,8 +1,8 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 0,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/Floor_Rug_B0732L974X/textures/rug_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "useTexture": false
         },
         "normal": {
             "textureMap": "Props/Floor_Rug_B0732L974X/textures/rug_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/Floor_Rug_B0732L974X/textures/rug_Roughness.png"

Gems/ArchVis/Assets/Props/Floor_Rug_B0732L974X/rug.prefab

@@ -23,10 +23,6 @@
                 "$type": "EditorVisibilityComponent",
                 "Id": 3499463310661147035
             },
-            "Component_[4870092573882602363]": {
-                "$type": "SelectionComponent",
-                "Id": 4870092573882602363
-            },
             "Component_[6094737195784703032]": {
                 "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                 "Id": 6094737195784703032,
@@ -116,6 +112,18 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2462484811
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{583B5C98-5128-5BA5-B871-1A248BF0AA3D}"
+                                            }
+                                        }
+                                    }
+                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 2815315404
@@ -187,10 +195,6 @@
                         }
                     }
                 },
-                "Component_[792897295609551859]": {
-                    "$type": "SelectionComponent",
-                    "Id": 792897295609551859
-                },
                 "Component_[8590453798853370125]": {
                     "$type": "EditorEntitySortComponent",
                     "Id": 8590453798853370125

Gems/ArchVis/Assets/Props/Floor_Rug_B0735THVQH/Rug_rugMAT.material

@@ -1,6 +1,6 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "propertyValues": {
         "baseColor.color": [
             0.5,
@@ -10,24 +10,10 @@
         ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "Props/Floor_Rug_B0735THVQH/textures/rug_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
         "general.applySpecularAA": true,
-        "irradiance.irradianceColorSource": "Manual",
         "metallic.useTexture": false,
         "normal.flipY": true,
         "normal.textureMap": "Props/Floor_Rug_B0735THVQH/textures/rug_Normal.png",
-        "opacity.factor": 1.0,
-        "parallax.algorithm": "ContactRefinement",
-        "parallax.factor": 0.0010000000474974513,
-        "parallax.quality": "Medium",
-        "parallax.textureMap": "Props/Floor_Rug_B0735THVQH/textures/rug_alt_Height.png",
         "roughness.factor": 0.800000011920929,
         "roughness.useTexture": false
     }

Gems/ArchVis/Assets/Props/Floor_Rug_B07B4YQGFJ/Rug.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80fd8a69cc87a8e0bd385ba3980c946ef066195a79919b8c0b4895430646c5db
-size 80828
+oid sha256:5642f02c2e6d58f77fb5801649ac2efcd3c437da301c0222e6a9d0ce1117b9ed
+size 57036

Gems/ArchVis/Assets/Props/Floor_Rug_B07B4YQGFJ/Rug_rugMAT.material

@@ -1,8 +1,8 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 0,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/Floor_Rug_B07B4YQGFJ/textures/rug_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "useTexture": false
         },
         "normal": {
             "textureMap": "Props/Floor_Rug_B07B4YQGFJ/textures/rug_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/Floor_Rug_B07B4YQGFJ/textures/rug_Roughness.png"

Gems/ArchVis/Assets/Props/FruitBowl/fruitbowl_appleBowlMAT.material

@@ -1,7 +1,7 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "Materials/Types/BasePBR.materialtype",
     "materialTypeVersion": 0,
     "properties": {
         "baseColor": {
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/FruitBowl/textures/fruitBowl_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "textureMap": "Props/FruitBowl/textures/fruitBowl_Metallic.png"
         },
         "normal": {
             "textureMap": "Props/FruitBowl/textures/fruitBowl_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/FruitBowl/textures/fruitBowl_Roughness.png"

Gems/ArchVis/Assets/Props/Gaming_Chair/Gaming_Chair.prefab

@@ -1,153 +0,0 @@
-{
-    "ContainerEntity": {
-        "Id": "ContainerEntity",
-        "Name": "gaming_chair",
-        "Components": {
-            "Component_[10345108179608596318]": {
-                "$type": "EditorVisibilityComponent",
-                "Id": 10345108179608596318
-            },
-            "Component_[12439840284917063411]": {
-                "$type": "EditorPendingCompositionComponent",
-                "Id": 12439840284917063411
-            },
-            "Component_[14276317833297835208]": {
-                "$type": "SelectionComponent",
-                "Id": 14276317833297835208
-            },
-            "Component_[14284587107928784543]": {
-                "$type": "EditorEntityIconComponent",
-                "Id": 14284587107928784543
-            },
-            "Component_[16481706386868034590]": {
-                "$type": "EditorLockComponent",
-                "Id": 16481706386868034590
-            },
-            "Component_[2802202449126986514]": {
-                "$type": "EditorInspectorComponent",
-                "Id": 2802202449126986514
-            },
-            "Component_[3296715728756709633]": {
-                "$type": "EditorPrefabComponent",
-                "Id": 3296715728756709633
-            },
-            "Component_[50250070063226324]": {
-                "$type": "EditorOnlyEntityComponent",
-                "Id": 50250070063226324
-            },
-            "Component_[6307336726536694188]": {
-                "$type": "EditorDisabledCompositionComponent",
-                "Id": 6307336726536694188
-            },
-            "Component_[723293917015639303]": {
-                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                "Id": 723293917015639303,
-                "Parent Entity": ""
-            },
-            "Component_[8683345757751151053]": {
-                "$type": "EditorEntitySortComponent",
-                "Id": 8683345757751151053
-            }
-        }
-    },
-    "Entities": {
-        "Entity_[2119190389465]": {
-            "Id": "Entity_[2119190389465]",
-            "Name": "gaming_chair",
-            "Components": {
-                "Component_[10390387481028755850]": {
-                    "$type": "EditorVisibilityComponent",
-                    "Id": 10390387481028755850
-                },
-                "Component_[12882056700834934117]": {
-                    "$type": "EditorInspectorComponent",
-                    "Id": 12882056700834934117,
-                    "ComponentOrderEntryArray": [
-                        {
-                            "ComponentId": 15898829915316789561
-                        },
-                        {
-                            "ComponentId": 4827708037505967370,
-                            "SortIndex": 1
-                        },
-                        {
-                            "ComponentId": 3967227572971173427,
-                            "SortIndex": 2
-                        }
-                    ]
-                },
-                "Component_[14731637986972015192]": {
-                    "$type": "EditorEntitySortComponent",
-                    "Id": 14731637986972015192
-                },
-                "Component_[15898829915316789561]": {
-                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                    "Id": 15898829915316789561,
-                    "Parent Entity": "ContainerEntity"
-                },
-                "Component_[2374257530236028844]": {
-                    "$type": "EditorEntityIconComponent",
-                    "Id": 2374257530236028844
-                },
-                "Component_[3967227572971173427]": {
-                    "$type": "EditorMaterialComponent",
-                    "Id": 3967227572971173427,
-                    "Controller": {
-                        "Configuration": {
-                            "materials": [
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2918633848
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{15B2BB0D-8A47-5701-866F-E7A121F35053}"
-                                            },
-                                            "assetHint": "props/gaming_chair/gaming_chair_gamingchairmat.azmaterial"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                },
-                "Component_[4827708037505967370]": {
-                    "$type": "AZ::Render::EditorMeshComponent",
-                    "Id": 4827708037505967370,
-                    "Controller": {
-                        "Configuration": {
-                            "ModelAsset": {
-                                "assetId": {
-                                    "guid": "{0383B92F-7576-5FDD-AA4E-D5E6271341E5}",
-                                    "subId": 269843319
-                                },
-                                "assetHint": "props/gaming_chair/gaming_chair.azmodel"
-                            }
-                        }
-                    }
-                },
-                "Component_[6756005295362001776]": {
-                    "$type": "EditorDisabledCompositionComponent",
-                    "Id": 6756005295362001776
-                },
-                "Component_[7169943484385943865]": {
-                    "$type": "EditorPendingCompositionComponent",
-                    "Id": 7169943484385943865
-                },
-                "Component_[7491740407655977884]": {
-                    "$type": "EditorLockComponent",
-                    "Id": 7491740407655977884
-                },
-                "Component_[8203032428569735590]": {
-                    "$type": "EditorOnlyEntityComponent",
-                    "Id": 8203032428569735590
-                },
-                "Component_[9818308136346710453]": {
-                    "$type": "SelectionComponent",
-                    "Id": 9818308136346710453
-                }
-            }
-        }
-    }
-}

Gems/ArchVis/Assets/Props/Gaming_Chair/Gaming_Chair_gamingChairMAT.material

@@ -1,27 +0,0 @@
-{
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
-    "propertyValues": {
-        "baseColor.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "baseColor.textureBlendMode": "Lerp",
-        "baseColor.textureMap": "Props/Gaming_Chair/textures/gaming_chair_BaseColor.png",
-        "emissive.color": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-        ],
-        "emissive.intensity": 0.0,
-        "emissive.useTexture": false,
-        "metallic.textureMap": "Props/Gaming_Chair/textures/gaming_chair_Metallic.png",
-        "normal.textureMap": "Props/Gaming_Chair/textures/gaming_chair_Normal.png",
-        "opacity.factor": 1.0,
-        "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "Props/Gaming_Chair/textures/gaming_chair_Roughness.png"
-    }
-}

Gems/ArchVis/Assets/Props/Gaming_Chair/gaming_chair.fbx

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96420b488de07e18f5af99cf68919f01dc0837804493b3edd027c9607966148e
-size 12762416

Gems/ArchVis/Assets/Props/Gaming_Chair/gaming_chair.mb

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1b7a2c8bcb78fc97f1d83e8c771777ea9f53cc86fad157adbd8871867ea616a
-size 9966964

Gems/ArchVis/Assets/Props/Gaming_Chair/textures/gaming_chair_BaseColor.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14ae3b88e1cee7aafbb8ddfce5a910b22bc961f5f67d981241dfc79323ccb26e
-size 361090

Gems/ArchVis/Assets/Props/Gaming_Chair/textures/gaming_chair_Metallic.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3df480b2b3b094fb5405848d906ac9d9f5418b823b36eee12583e39daf6dbb3
-size 27189

Gems/ArchVis/Assets/Props/Gaming_Chair/textures/gaming_chair_Normal.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fbafa87f271f2c5ed7b79a10a12717c70e9ab0a7c92b95ad99bd77053f62e3e9
-size 17668533

Gems/ArchVis/Assets/Props/Gaming_Chair/textures/gaming_chair_Roughness.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff7bdce0607d9fcca199bb42b1bdd3c9e2d2defcc5ba86516611ba1b8d622eae
-size 299686

Gems/ArchVis/Assets/Props/KitchenTable/kitchenTable_tableMAT.material

@@ -1,8 +1,8 @@
 {
     "description": "",
     "parentMaterial": "",
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 0,
+    "materialType": "Materials/Types/BasePBR.materialtype",
+    "materialTypeVersion": 1,
     "properties": {
         "baseColor": {
             "color": [
@@ -14,25 +14,12 @@
             "textureBlendMode": "Lerp",
             "textureMap": "Props/KitchenTable/textures/table_BaseColor.png"
         },
-        "emissive": {
-            "color": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-            ],
-            "intensity": 0.0,
-            "useTexture": false
-        },
         "metallic": {
             "textureMap": "Props/KitchenTable/textures/table_Metallic.png"
         },
         "normal": {
             "textureMap": "Props/KitchenTable/textures/table_Normal.png"
         },
-        "opacity": {
-            "factor": 1.0
-        },
         "roughness": {
             "factor": 0.33000001311302185,
             "textureMap": "Props/KitchenTable/textures/table_Roughness.png"

Gems/ArchVis/Assets/Props/Kitchen_Cook_Book/Kitchen_Cookbook.fbx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e338a035f6cf5fc98b3f48333390697c96715b505242dc1c94108119975d7258
-size 195996
+oid sha256:15376f6264db7bd572fbbb345cb1d1487fde46be49ec03ab31d538c27dab87e5
+size 213804