From be6bfdd4af56c2ed9f561f21b4bce19b86ab873b Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 8 Sep 2016 13:58:13 +0200
Subject: [PATCH 1/3] Add a "linked" icon to settings that have
 "global_inherits_stack" set

---
 resources/qml/Settings/SettingItem.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index ed16b722dd..cdc557a089 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -138,7 +138,7 @@ Item {
             {
                 id: linkedSettingIcon;
 
-                visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && !definition.settable_per_extruder && base.showLinkedSettingIcon
+                visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || definition.global_inherits_stack != "-1") && base.showLinkedSettingIcon
 
                 height: parent.height;
                 width: height;

From 46942d7cf23e32dcdf5dbf00440aa781061f4f65 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 8 Sep 2016 14:02:44 +0200
Subject: [PATCH 2/3] Remove "infill mesh" as a standard visible setting

---
 cura/CuraApplication.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 32c5191c7c..14e4cd9bf1 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -253,7 +253,6 @@ class CuraApplication(QtApplication):
             meshfix
             blackmagic
                 print_sequence
-                infill_mesh
             experimental
         """.replace("\n", ";").replace(" ", ""))
 

From 4de78db87a6d6396590079486b396ae66b522538 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 8 Sep 2016 14:04:58 +0200
Subject: [PATCH 3/3] Revert "Remove "infill mesh" as a standard visible
 setting"

This reverts commit 46942d7cf23e32dcdf5dbf00440aa781061f4f65.

It was not my decision to make
---
 cura/CuraApplication.py                                | 1 +
 plugins/3MFReader/ThreeMFReader.py                     | 2 +-
 plugins/PerObjectSettingsTool/PerObjectSettingsTool.py | 5 ++++-
 plugins/SolidView/SolidView.py                         | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 14e4cd9bf1..32c5191c7c 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -253,6 +253,7 @@ class CuraApplication(QtApplication):
             meshfix
             blackmagic
                 print_sequence
+                infill_mesh
             experimental
         """.replace("\n", ";").replace(" ", ""))
 
diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py
index ea3ca30118..89fa5e3e88 100644
--- a/plugins/3MFReader/ThreeMFReader.py
+++ b/plugins/3MFReader/ThreeMFReader.py
@@ -71,7 +71,7 @@ class ThreeMFReader(MeshReader):
                 rotation.setByRotationAxis(-0.5 * math.pi, Vector(1, 0, 0))
 
                 # TODO: We currently do not check for normals and simply recalculate them.
-                mesh_builder.calculateNormals()
+                mesh_builder.calculateNormals(flip = True)
                 mesh_builder.setFileName(file_name)
                 node.setMeshData(mesh_builder.build().getTransformed(rotation))
                 node.setSelectable(True)
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
index 5c52c89416..953f60a33d 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py
@@ -77,7 +77,10 @@ class PerObjectSettingsTool(Tool):
             if not self._multi_extrusion:
                 default_stack_id = global_container_stack.getId()
             else:
-                default_stack_id = ExtruderManager.getInstance().getExtruderStack(0).getId()
+                default_stack = ExtruderManager.getInstance().getExtruderStack(0)
+                if default_stack:
+                    default_stack_id = default_stack.getId()
+                else: default_stack_id = global_container_stack.getId()
 
             root_node = Application.getInstance().getController().getScene().getRoot()
             for node in DepthFirstIterator(root_node):
diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py
index 2d017f829f..fd9f106334 100644
--- a/plugins/SolidView/SolidView.py
+++ b/plugins/SolidView/SolidView.py
@@ -51,6 +51,8 @@ class SolidView(View):
             if multi_extrusion:
                 support_extruder_nr = global_container_stack.getProperty("support_extruder_nr", "value")
                 support_angle_stack = ExtruderManager.getInstance().getExtruderStack(support_extruder_nr)
+                if not support_angle_stack:
+                    support_angle_stack = global_container_stack
             else:
                 support_angle_stack = global_container_stack