preserve 'slicing' widget state when slice + preview run in series
This commit is contained in:
parent
a2ebff2a6d
commit
55310dcea4
1 changed files with 7 additions and 5 deletions
|
|
@ -865,10 +865,12 @@
|
||||||
}
|
}
|
||||||
updateSliderMax(true);
|
updateSliderMax(true);
|
||||||
setVisibleLayer(-1, 0);
|
setVisibleLayer(-1, 0);
|
||||||
// clear wireframe
|
if (scale === 1) {
|
||||||
widget.setWireframe(false, color.wireframe, color.wireframe_opacity);
|
// clear wireframe
|
||||||
widget.setOpacity(camOrLaser ? color.cam_sliced_opacity : color.sliced_opacity);
|
widget.setWireframe(false, color.wireframe, color.wireframe_opacity);
|
||||||
widget.setColor(color.deselected);
|
widget.setOpacity(camOrLaser ? color.cam_sliced_opacity : color.sliced_opacity);
|
||||||
|
widget.setColor(color.deselected);
|
||||||
|
}
|
||||||
// on the last exit, update ui and call the callback
|
// on the last exit, update ui and call the callback
|
||||||
if (--countdown === 0 || error || errored) {
|
if (--countdown === 0 || error || errored) {
|
||||||
// mark slicing complete for prep/preview
|
// mark slicing complete for prep/preview
|
||||||
|
|
@ -942,7 +944,7 @@
|
||||||
forAllWidgets(function(widget) {
|
forAllWidgets(function(widget) {
|
||||||
widget.setColor(color.cam_preview);
|
widget.setColor(color.cam_preview);
|
||||||
});
|
});
|
||||||
} else if (feature.preview) {
|
} else if (feature.preview && offset === 0) {
|
||||||
setOpacity(color.preview_opacity);
|
setOpacity(color.preview_opacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue