From d2bac2f858c9eb319c304ae7c83bb8326e341c58 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart@neuron.com>
Date: Wed, 22 Jul 2020 13:13:00 -0400
Subject: [PATCH] fix hasStock check. default to GridLocal for OctoPrint

---
 src/kiri/conf.js       | 4 ++--
 src/mode/cam/driver.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/kiri/conf.js b/src/kiri/conf.js
index 537acb73..b56a9396 100644
--- a/src/kiri/conf.js
+++ b/src/kiri/conf.js
@@ -603,9 +603,9 @@
                 autoLayout: true,
                 alignTop: true,
                 units: "mm",
-                exportOcto: true,
+                exportOcto: false,
                 exportGhost: false,
-                exportLocal: false
+                exportLocal: true
             },
             // for passing temporary slice hints (topo currently)
             synth: {},
diff --git a/src/mode/cam/driver.js b/src/mode/cam/driver.js
index 7257155a..1a96778f 100644
--- a/src/mode/cam/driver.js
+++ b/src/mode/cam/driver.js
@@ -1806,7 +1806,7 @@
             mode = 0,
             point,
             points = 0,
-            hasStock = spro.camStockZ && spro.camStockX && spro.camStockY,
+            hasStock = spro.camStockOffset || (spro.camStockZ && spro.camStockX && spro.camStockY),
             zmax = hasStock ? settings.stock.z : bounds.max.z,
             runbox = {
                 max: { x:-Infinity, y:-Infinity, z:-Infinity},