From e42ffb23cae1edb90c6c36cfe263dbd514ae435c Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Thu, 15 Oct 2015 01:04:32 +0200
Subject: [PATCH] Move the infill pattern and infill overlap settings back as
 children of infill_density

This makes the inherit functions work properly
---
 resources/machines/fdmprinter.json | 50 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index 9ca44a7e86..577181a63a 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -455,32 +455,32 @@
                             "visible": false,
                             "inherit_function": "0 if parent_value == 0 else (infill_line_width * 100) / parent_value"
                         }
-                    }
-                },
-                "infill_pattern": {
-                    "label": "Infill Pattern",
-                    "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.",
-                    "type": "enum",
-                    "visible": false,
-                    "options": {
-                        "grid": "Grid",
-                        "lines": "Lines",
-                        "concentric": "Concentric",
-                        "zigzag": "Zig Zag"
                     },
-                    "default": "grid",
-                    "inherit_function": "'lines' if parent_value > 25 else 'grid'"
-                },
-                "infill_overlap": {
-                    "label": "Infill Overlap",
-                    "description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.",
-                    "unit": "%",
-                    "type": "float",
-                    "default": 10,
-                    "min_value": "0",
-                    "max_value": "100",
-                    "inherit_function": "10 if infill_sparse_density < 95 else 0",
-                    "visible": false
+                    "infill_pattern": {
+                        "label": "Infill Pattern",
+                        "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.",
+                        "type": "enum",
+                        "visible": false,
+                        "options": {
+                            "grid": "Grid",
+                            "lines": "Lines",
+                            "concentric": "Concentric",
+                            "zigzag": "Zig Zag"
+                        },
+                        "default": "grid",
+                        "inherit_function": "'lines' if parent_value > 25 else 'grid'"
+                    },
+                    "infill_overlap": {
+                        "label": "Infill Overlap",
+                        "description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.",
+                        "unit": "%",
+                        "type": "float",
+                        "default": 10,
+                        "min_value": "0",
+                        "max_value": "100",
+                        "inherit_function": "10 if infill_sparse_density < 95 else 0",
+                        "visible": false
+                    }
                 },
                 "infill_wipe_dist": {
                     "label": "Infill Wipe Distance",