From e3b31203c3b46b389ac689574958c5805455d8d0 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 8 Jan 2022 21:18:09 -0500 Subject: [PATCH] restore group names during obj decoding --- src/load/file.js | 2 +- src/load/obj.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/load/file.js b/src/load/file.js index 646b886b..71301bd4 100644 --- a/src/load/file.js +++ b/src/load/file.js @@ -30,7 +30,7 @@ function load_data(data, file, ext) { }]); break; case "obj": - resolve(load.OBJ.parse(data).map(m => { return {mesh: m.toFloat32(), file} })); + resolve(load.OBJ.parse(data).map(m => { return {mesh: m.toFloat32(), file: m.name || file} })); break; case "3mf": load.TMF.parseAsync(data).then((meshes) => { diff --git a/src/load/obj.js b/src/load/obj.js index 3f486ce8..58138b6a 100644 --- a/src/load/obj.js +++ b/src/load/obj.js @@ -54,7 +54,7 @@ function parse(text) { objs.push(faces = []); } if (toks[0]) { - faces.name = toks[0]; + faces.name = toks.join(' '); } break; }