From 3fd79573e64ddf8ede2f18a335aebfacab0bb3bf Mon Sep 17 00:00:00 2001
From: Stewart Allen <sa@grid.space>
Date: Fri, 28 Jan 2022 17:24:39 -0500
Subject: [PATCH] svg import behavior normalized for all modes

---
 notes.md          |  1 +
 src/kiri/main.js  | 24 ++++++++++--------------
 src/kiri/print.js |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/notes.md b/notes.md
index 5084e255..3cd46dbc 100644
--- a/notes.md
+++ b/notes.md
@@ -20,6 +20,7 @@
 * `F` complete and expose grouping feature
 * `F` add svgnest-like arrange algorithm
 * `F` warn if part hanging in negative Z space or off bed in general
+* `F` add instancing support for 3MF files on import
 
 # FDM
 
diff --git a/src/kiri/main.js b/src/kiri/main.js
index 759832a1..5214a7ba 100644
--- a/src/kiri/main.js
+++ b/src/kiri/main.js
@@ -2884,20 +2884,16 @@
                     load_dec();
                 }
                 else if (issvg) {
-                    if (MODE === MODES.LASER) {
-                        loadCode(e.target.result, 'svg');
-                    } else {
-                        let name = e.target.file.name;
-                        let svg = LOAD.SVG.parse(e.target.result);
-                        let ind = 0;
-                        for (let v of svg) {
-                            let num = ind++;
-                            platform.add(
-                                newWidget(undefined, group)
-                                .loadVertices(svg[num].toFloat32())
-                                .saveToCatalog(num ? `${name}-${num}` : name)
-                            );
-                        }
+                    let name = e.target.file.name;
+                    let svg = LOAD.SVG.parse(e.target.result);
+                    let ind = 0;
+                    for (let v of svg) {
+                        let num = ind++;
+                        platform.add(
+                            newWidget(undefined, group)
+                            .loadVertices(svg[num].toFloat32())
+                            .saveToCatalog(num ? `${name}-${num}` : name)
+                        );
                     }
                     load_dec();
                 }
diff --git a/src/kiri/print.js b/src/kiri/print.js
index b89ffbab..5c101222 100644
--- a/src/kiri/print.js
+++ b/src/kiri/print.js
@@ -48,7 +48,7 @@
         this.id = id || new Date().getTime().toString(36);
         this.settings = settings;
         this.widgets = widgets;
-        debugE = settings.controller.devel ? 1 : 0;
+        debugE = settings ? (settings.controller.devel ? 1 : 0) : 0;
     }
 
     PRO.addOutput = addOutput;