Merge remote-tracking branch 'refs/remotes/origin/dev' into gh-pages

lautr3k · 9a7c56f333f4e334185d5fb50377fc5bf16c7f65 · lautr3k committed Aug 6, 2016 · Aug 6, 2016 · 9a7c56f
2 parents b735d12 + 8cddff9
commit 9a7c56f333f4e334185d5fb50377fc5bf16c7f65
Unified Split

Showing with 3 additions and 5 deletions.

+3 −5 js/main.js
diff --git a/js/main.js b/js/main.js
@@ -942,10 +942,8 @@ function updateTransformValues() {
     current.y = input.y;
     current.z = input.z;
 
-    //var currentLayer = settings.get('');
-    loadGeometry(slicer.mesh.geometry);
+    loadGeometry(slicer.mesh.geometry, false);
     getSlice($sliderInput.slider('getValue'));
-    //viewer3d.render();
 }
 
 $transformButtons.on('click', function(e) {
@@ -991,7 +989,7 @@ function loadGeometry(geometry, mirror) {
         removeShapes();
 
         // flip geometry
-        if (mirror || settings.get('slicer.mirror')) {
+        if (mirror) {
             geometry.applyMatrix(new THREE.Matrix4().makeScale(-1, 1, 1));
         }
 
@@ -1030,7 +1028,7 @@ function ultraMegaDirtyFix() {
 // On Geometry loaded
 loader.onGeometry = function(geometry) {
     resetTransformValues();
-    loadGeometry(geometry);
+    loadGeometry(geometry, settings.get('slicer.mirror'));
     ultraMegaDirtyFix();
 };