Moved the debug view mode setting to the "blend" group because the only modes we have right now are related to layer blending.

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": [
                 {

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

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

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