Merge branch 'master' of github.com:daid/Cura

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 14459d71d0fe96df552a7274530d4d1f4b14296e..d9749242412b14ffd75d6d8f49446479e8c6999d 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -208,9 +208,9 @@ class mainWindow(configBase.configWindowBase):
                        loadButton2 = wx.Button(self, -1, 'Load Dual')
                        self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(2), loadButton2)
                if extruderCount > 2:
-                       loadButton3 = wx.Button(self, -1, 'Load Tripple')
+                       loadButton3 = wx.Button(self, -1, 'Load Triple')
                        self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(3), loadButton3)
-               if extruderCount > 2:
+               if extruderCount > 3:
                        loadButton4 = wx.Button(self, -1, 'Load Quad')
                        self.Bind(wx.EVT_BUTTON, lambda e: self._showModelLoadDialog(4), loadButton4)
 

diff --git a/Cura/util/util3d.py b/Cura/util/util3d.py
index 2592785b8f0e4e13acd4155403043fb9d60cbaf8..217814bec83a55ebd730e181ed49da9dffcf847c 100644 (file)
--- a/Cura/util/util3d.py
+++ b/Cura/util/util3d.py
@@ -33,14 +33,14 @@ class Vector3(object):
 
        def __iadd__(self, v):
                self.x += v.x
-               self.y += v.x
-               self.z += v.x
+               self.y += v.y
+               self.z += v.z
                return self
 
        def __isub__(self, v):
                self.x += v.x
-               self.y += v.x
-               self.z += v.x
+               self.y += v.y
+               self.z += v.z
                return self
 
        def __imul__(self, v):