Merge branch 'master' into feature_separate_stage_qml

cura/CuraApplication.py

@@ -742,7 +742,7 @@ class CuraApplication(QtApplication):
         # Initialize camera tool
         camera_tool = controller.getTool("CameraTool")
         camera_tool.setOrigin(Vector(0, 100, 0))
-        camera_tool.setZoomRange(0.1, 200000)
+        camera_tool.setZoomRange(0.1, 2000)
 
         # Initialize camera animations
         self._camera_animation = CameraAnimation.CameraAnimation()

cura/PreviewPass.py

@@ -95,7 +95,7 @@ class PreviewPass(RenderPass):
                         diffuse_color[2] * shade_factor,
                         1.0]
                     uniforms["diffuse_color"] = prettier_color(diffuse_color)
-                    uniforms["diffuse_color_2"] = prettier_color(diffuse_color2)
+                    uniforms["diffuse_color_2"] = diffuse_color2
                     batch_support_mesh.addItem(node.getWorldTransformation(), node.getMeshData(), uniforms = uniforms)
                 else:
                     # Normal scene node

cura/Settings/MachineManager.py

@@ -342,9 +342,6 @@ class MachineManager(QObject):
         self._initMachineState(containers[0])
         self._onGlobalContainerChanged()
 
-            #The signal should update/reset settings of all connected USB devices
-            #self.usbOutputDeviceChanged.emit()
-
         self.__emitChangedSignals()
 
     ##  Given a definition id, return the machine with this id.

resources/qml/MachineSelection.qml

@@ -83,16 +83,4 @@ ToolButton
     }
 
     menu: PrinterMenu { }
-
-    // Make the toolbutton react when the global container changes, otherwise if Cura is not connected to the printer,
-    // switching printers make no reaction
-    Connections
-    {
-        target: Cura.MachineManager
-        onGlobalContainerChanged:
-        {
-            base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != ""
-            base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0
-        }
-    }
 }

resources/qml/PrepareSidebar.qml

@@ -610,16 +610,4 @@ Rectangle
         watchedProperties: [ "value" ]
         storeIndex: 0
     }
-
-    // Make the ConfigurationSelector react when the global container changes, otherwise if Cura is not connected to the printer,
-    // switching printers make no reaction
-    Connections
-    {
-        target: Cura.MachineManager
-        onGlobalContainerChanged:
-        {
-            base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != ""
-            base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0
-        }
-    }
 }