From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 19 Sep 2013 15:32:59 +0000 (+0200)
Subject: merged
X-Git-Tag: 13.10~58^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=de3dcaca7d44cc0125eaec8060402741c20521db;p=cura.git

merged
---

de3dcaca7d44cc0125eaec8060402741c20521db
diff --cc Cura/gui/mainWindow.py
index 97ea62dc,2f1dfa9f..f6260a94
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@@ -306,8 -268,8 +306,8 @@@ class mainWindow(wx.Frame)
  	def OnDropFiles(self, files):
  		if len(files) > 0:
  			profile.setPluginConfig([])
 -			self.updateProfileToControls()
 +			self.updateProfileToAllControls()
- 		self.scene.loadScene(files)
+ 		self.scene.loadFiles(files)
  
  	def OnModelMRU(self, e):
  		fileNum = e.GetId() - self.ID_MRU_MODEL1