From 55310dcea43988123b078d5f7996f1f346e70b6f Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Wed, 13 Jan 2021 10:41:02 -0500 Subject: [PATCH] preserve 'slicing' widget state when slice + preview run in series --- src/kiri/main.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index 09aefe5f..6a25a4a5 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -865,10 +865,12 @@ } updateSliderMax(true); setVisibleLayer(-1, 0); - // clear wireframe - widget.setWireframe(false, color.wireframe, color.wireframe_opacity); - widget.setOpacity(camOrLaser ? color.cam_sliced_opacity : color.sliced_opacity); - widget.setColor(color.deselected); + if (scale === 1) { + // clear wireframe + widget.setWireframe(false, color.wireframe, color.wireframe_opacity); + widget.setOpacity(camOrLaser ? color.cam_sliced_opacity : color.sliced_opacity); + widget.setColor(color.deselected); + } // on the last exit, update ui and call the callback if (--countdown === 0 || error || errored) { // mark slicing complete for prep/preview @@ -942,7 +944,7 @@ forAllWidgets(function(widget) { widget.setColor(color.cam_preview); }); - } else if (feature.preview) { + } else if (feature.preview && offset === 0) { setOpacity(color.preview_opacity); }