Merge branch '3.3'

This commit is contained in:
Aleksei S 2018-04-09 12:53:53 +02:00
commit c7b6bb8188
2 changed files with 34 additions and 6 deletions

View file

@ -855,6 +855,16 @@ UM.MainWindow
id: askOpenAsProjectOrModelsDialog
}
Connections
{
target: CuraApplication
onOpenProjectFile:
{
askOpenAsProjectOrModelsDialog.fileUrl = project_file;
askOpenAsProjectOrModelsDialog.show();
}
}
EngineLog
{
id: engineLog;