Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integration Fixes for Web Based Controllers #12

Merged
2 commits merged into from
Aug 9, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ function updateBuildVolumeSettings() {
});

viewer3d.setBuildVolume(settings.get('buildVolume'));
viewer3d.dropObject(slicer.mesh);
slicer.mesh && viewer3d.dropObject(slicer.mesh);
viewer3d.render();

size && updateMeshInfoUI();
Expand Down Expand Up @@ -1064,8 +1064,8 @@ var stl = 'stl/StressTest.stl';
//var stl = 'stl/SLAcer.stl';

// File url
var url = 'http://' + window.location.hostname + window.location.pathname + stl;

// var url = 'http://' + window.location.hostname + window.location.pathname + stl;
var url = window.location.href + stl;
// Create http request object
var xmlhttp = new XMLHttpRequest();

Expand Down