From 4086edc3f7fdf95b8d7b8e2b463d6bc150c3d17f Mon Sep 17 00:00:00 2001
From: Chris Santora <santorac@amazon.com>
Date: Thu, 20 May 2021 12:14:33 -0700
Subject: [PATCH] Moved the debug view mode setting to the "blend" group
 because the only modes we have right now are related to layer blending.

---
 .../Types/StandardMultilayerPBR.materialtype  | 35 +++++++++----------
 .../003_Debug_BlendMask.material              |  2 +-
 .../003_Debug_BlendWeights.material           |  2 +-
 .../003_Debug_Displacement.material           |  2 +-
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
index 88bd87a494..274cb4dcb5 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
@@ -3,11 +3,6 @@
     "propertyLayout": {
         "version": 3,
         "groups": [
-            {
-                "id": "general",
-                "displayName": "General",
-                "description": "General settings."
-            },
             {
                 "id": "blend",
                 "displayName": "Blend Settings",
@@ -29,6 +24,11 @@
                 "displayName": "Irradiance",
                 "description": "Properties for configuring the irradiance used in global illumination."
             },
+            {
+                "id": "general",
+                "displayName": "General",
+                "description": "General settings."
+            },
             //##############################################################################################
             // Layer 1 Groups 
             //##############################################################################################
@@ -194,18 +194,6 @@
             // General Properties 
             //##############################################################################################
             "general": [
-                {
-                    "id": "debugDrawMode",
-                    "displayName": "Debug Draw Mode",
-                    "description": "Enables various debug view features.",
-                    "type": "Enum",
-                    "enumValues": [ "None", "BlendMask", "Displacement", "FinalBlendWeights" ],
-                    "defaultValue": "None",
-                    "connection": {
-                        "type": "ShaderOption",
-                        "id": "o_debugDrawMode"
-                    }
-                },
                 {
                     "id": "applySpecularAA",
                     "displayName": "Apply Specular AA",
@@ -365,8 +353,19 @@
                         "type": "ShaderInput",
                         "id": "m_displacementBlendDistance"
                     }
+                },
+                {
+                    "id": "debugDrawMode",
+                    "displayName": "Debug Draw Mode",
+                    "description": "Enables various debug view features.",
+                    "type": "Enum",
+                    "enumValues": [ "None", "BlendMask", "Displacement", "FinalBlendWeights" ],
+                    "defaultValue": "None",
+                    "connection": {
+                        "type": "ShaderOption",
+                        "id": "o_debugDrawMode"
+                    }
                 }
-
             ],
             "parallax": [
                 {
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material
index df81b9b25a..ffcbf3ce7e 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material
@@ -4,7 +4,7 @@
     "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
     "propertyLayoutVersion": 3,
     "properties": {
-        "general": {
+        "blend": {
             "debugDrawMode": "BlendMask"
         }
     }
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material
index 4cd6546028..8d13ac781f 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material
@@ -4,7 +4,7 @@
     "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
     "propertyLayoutVersion": 3,
     "properties": {
-        "general": {
+        "blend": {
             "debugDrawMode": "FinalBlendWeights"
         }
     }
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material
index fb4db87c2c..7aff50cb56 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material
@@ -4,7 +4,7 @@
     "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
     "propertyLayoutVersion": 3,
     "properties": {
-        "general": {
+        "blend": {
             "debugDrawMode": "Displacement"
         }
     }