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

2021-05-20 12:14:33 -07:00
parent 599877a7e1
commit 4086edc3f7
4 changed files with 20 additions and 21 deletions
@@ -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": [
                {
@@ -4,7 +4,7 @@
    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
    "propertyLayoutVersion": 3,
    "properties": {
-        "general": {
+        "blend": {
            "debugDrawMode": "BlendMask"
        }
    }
@@ -4,7 +4,7 @@
    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
    "propertyLayoutVersion": 3,
    "properties": {
-        "general": {
+        "blend": {
            "debugDrawMode": "FinalBlendWeights"
        }
    }
@@ -4,7 +4,7 @@
    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
    "propertyLayoutVersion": 3,
    "properties": {
-        "general": {
+        "blend": {
            "debugDrawMode": "Displacement"
        }
    }