Filter material/quality by machine only when we should filter

Contributes to CURA-1612
2025-11-02 20:52:20 -07:00 · 2016-06-02 08:07:51 +02:00 · 2016-06-02 08:07:51 +02:00 · ceb21ce89b
commit ceb21ce89b
parent 123af4e3e4
2 changed files with 34 additions and 2 deletions
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@ -266,7 +266,23 @@ Item
                        id: materialSelectionInstantiator
                        model: UM.InstanceContainersModel
                        {
-                            filter: { "type": "material", "definition": Cura.MachineManager.activeDefinitionId }
+                            filter:
+                            {
+                                var result = { "type": "material" }
+                                if(Cura.MachineManager.filterMaterialsByMachine)
+                                {
+//                                     result.definition = Cura.MachineManager.activeDefinitionId
+                                    if(Cura.MachineManager.hasVariants)
+                                    {
+                                        result.variant = Cura.MachineManager.activeVariantId
+                                    }
+                                }
+                                else
+                                {
+                                    result.definition = "fdmprinter"
+                                }
+                                return result
+                            }
                        }
                        MenuItem
                        {