3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-30 22:31:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.3'

Browse source
This commit is contained in:
Lipu Fei 2018-04-10 11:41:13 +02:00
commit 107c10b860
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/AskOpenAsProjectOrModelsDialog.qml
View file

@ -53,7 +53,7 @@ UM.Dialog
UM.Preferences.setValue("cura/choice_on_open_project", "open_as_model")
}
CuraApplication.readLocalFile(base.fileUrl)
CuraApplication.readLocalFile(base.fileUrl, true)
var meshName = backgroundItem.getMeshName(base.fileUrl.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName))

2
resources/qml/Menus/RecentFilesMenu.qml
View file

@ -61,7 +61,7 @@ Menu
}
else if (toOpenAsModel)
{
CuraApplication.readLocalFile(modelData);
CuraApplication.readLocalFile(modelData, true);
}
var meshName = backgroundItem.getMeshName(modelData.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName))

2
resources/qml/OpenFilesIncludingProjectsDialog.qml
View file

@ -42,7 +42,7 @@ UM.Dialog
{
for (var i in fileUrls)
{
CuraApplication.readLocalFile(fileUrls[i]);
CuraApplication.readLocalFile(fileUrls[i], true);
}
var meshName = backgroundItem.getMeshName(fileUrls[0].toString());