From 86d8f8517d2f7ef05107c1be824dab9acf992872 Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Fri, 21 Sep 2018 13:48:46 +0200
Subject: [PATCH 1/3] In material page was not defined the used extruder nr,
 for generic materials CURA-5682

---
 resources/qml/Preferences/Materials/MaterialsList.qml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml
index cb5de685e2..f40a5acdb6 100644
--- a/resources/qml/Preferences/Materials/MaterialsList.qml
+++ b/resources/qml/Preferences/Materials/MaterialsList.qml
@@ -19,7 +19,11 @@ Item
     UM.I18nCatalog { id: catalog; name: "cura"; }
     Cura.MaterialBrandsModel { id: materialsModel }
     Cura.FavoriteMaterialsModel { id: favoriteMaterialsModel }
-    Cura.GenericMaterialsModel { id: genericMaterialsModel }
+    Cura.GenericMaterialsModel
+    {
+        id: genericMaterialsModel
+        extruderPosition: Cura.ExtruderManager.activeExtruderIndex
+    }
 
     property var currentType: null
     property var currentBrand: null

From b44fb7ca2429a5ffe99d0c5694206d2bb0fe7e35 Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Fri, 21 Sep 2018 17:35:46 +0200
Subject: [PATCH 2/3] Select correct material according to the active extruder
 CURA-5682

---
 .../qml/Preferences/Materials/MaterialsList.qml    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml
index f40a5acdb6..00bead9650 100644
--- a/resources/qml/Preferences/Materials/MaterialsList.qml
+++ b/resources/qml/Preferences/Materials/MaterialsList.qml
@@ -17,8 +17,18 @@ Item
 
     // Children
     UM.I18nCatalog { id: catalog; name: "cura"; }
-    Cura.MaterialBrandsModel { id: materialsModel }
-    Cura.FavoriteMaterialsModel { id: favoriteMaterialsModel }
+    Cura.MaterialBrandsModel
+    {
+        id: materialsModel
+        extruderPosition: Cura.ExtruderManager.activeExtruderIndex
+    }
+
+    Cura.FavoriteMaterialsModel
+    {
+        id: favoriteMaterialsModel
+        extruderPosition: Cura.ExtruderManager.activeExtruderIndex
+    }
+
     Cura.GenericMaterialsModel
     {
         id: genericMaterialsModel

From fe8aa02e7ce2c643a4ff58a708eb3bf3f88eaef5 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Mon, 24 Sep 2018 11:44:53 +0200
Subject: [PATCH 3/3] Fix a direct signal emission that causes max recursion
 error

CURA-5682

A max recursion error will occur when the user creates a material on the
material management page. Too many signals get directly triggered and
some of them head back again and causes a max recursion error.
---
 cura/Settings/CuraContainerStack.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py
index c8d1d9e370..0ec95e2e41 100755
--- a/cura/Settings/CuraContainerStack.py
+++ b/cura/Settings/CuraContainerStack.py
@@ -291,7 +291,7 @@ class CuraContainerStack(ContainerStack):
 
     # Helper to make sure we emit a PyQt signal on container changes.
     def _onContainersChanged(self, container: Any) -> None:
-        self.pyqtContainersChanged.emit()
+        Application.getInstance().callLater(self.pyqtContainersChanged.emit)
 
     # Helper that can be overridden to get the "machine" definition, that is, the definition that defines the machine
     # and its properties rather than, for example, the extruder. Defaults to simply returning the definition property.