From cbb446eda18e4e3b69a670dcba3728b01169e9d9 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Mon, 8 Nov 2021 20:23:56 -0500 Subject: [PATCH] fix select/deselect and recurse --- src/kiri/init.js | 2 +- src/kiri/main.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index aefc4961..68cca0c9 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2379,7 +2379,7 @@ if (event && event.target.nodeName === "CANVAS") { if (object && object.object) { if (object.object.widget) { - platform.select(object.object.widget, event.shiftKey); + platform.select(object.object.widget, event.shiftKey, false); } } else { platform.deselect(); diff --git a/src/kiri/main.js b/src/kiri/main.js index 9d7a0a30..4b9fc4f5 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -1853,7 +1853,7 @@ if (viewMode !== VIEWS.ARRANGE) { return; } - // apply deselect to entire group + // apply select to entire group if (recurse && widget && widget.group.length > 1) { for (let w of widget.group) { platformSelect(w, true, false); @@ -1864,15 +1864,15 @@ sel = (selectedMeshes.indexOf(mesh) >= 0); if (sel) { if (shift) { - platform.deselect(widget) + platform.deselect(widget, recurse) } else if (selectedMeshes.length > 1) { - platform.deselect(); - platform.select(widget, false); + platform.deselect(undefined, recurse); + platform.select(widget, false, recurse); } } else { // prevent selection in slice view if (!mesh.material.visible) return; - if (!shift) platform.deselect(); + if (!shift) platform.deselect(undefined, recurse); selectedMeshes.push(mesh); API.event.emit('widget.select', widget); widget.setColor(color.selected); @@ -2135,7 +2135,7 @@ w.setColor(color); }; b.onclick = function() { - platformSelect(w, true); + platformSelect(w, true, false); color = w.getColor(); }; }