diff options
author | Marius Kintel <marius@kintel.net> | 2011-09-28 20:30:20 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-09-28 20:30:20 (GMT) |
commit | 653f9b538da793ffb4a4dbad7d1669196da9eb85 (patch) | |
tree | 6af83b0b32aa534f8c728d867f98112144fbb2b9 | |
parent | fcb0145cb82e3086032c9b9aca4c4fc1e0a25611 (diff) | |
parent | 17c37616f3524a9f826622f50e80f39ef4bb11f8 (diff) |
Merge branch 'master' of github.com:openscad/openscad
-rw-r--r-- | src/dxfdata.h | 2 | ||||
-rw-r--r-- | src/mainwin.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dxfdata.h b/src/dxfdata.h index bada031..d24541c 100644 --- a/src/dxfdata.h +++ b/src/dxfdata.h @@ -30,7 +30,7 @@ public: } }; - std::vector<Vector2d> points; + std::vector<Vector2d, Eigen::aligned_allocator<Vector2d> > points; std::vector<Path> paths; std::vector<Dim> dims; diff --git a/src/mainwin.cc b/src/mainwin.cc index 56502f2..51e85e7 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -1728,7 +1728,7 @@ void MainWindow::dropEvent(QDropEvent *event) for (int i = 0; i < urls.size(); i++) { if (urls[i].scheme() != "file") continue; - openFile(urls[i].path()); + openFile(urls[i].toLocalFile()); } clearCurrentOutput(); } |