From 164013834a23170b261ea78ecc747463f137c80c Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 9 Oct 2021 14:55:28 -0400 Subject: [PATCH] prevent loop ranges from mixing with other parameter ranges --- src/kiri/main.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index 2456787d..a03c62c9 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -763,6 +763,11 @@ return; } + // set aside belt loops and re-append later + // since we do not want to collapse/merge loops + let exclude = ranges.filter(r => r.fields.outputLoops); + ranges = ranges.filter(r => !r.fields.outputLoops); + // flatten ranges ranges.push({lo, hi, fields: values}); for (let range of ranges) { @@ -780,7 +785,7 @@ } // merge contiguous matching ranges - ranges.length = 0; + ranges = settings.process.ranges = []; let range; for (let i=min; i<=max; i++) { let slice = slices[i]; @@ -799,6 +804,8 @@ } ranges.push(range); + ranges.appendAll(exclude); + updateFieldsFromSettings(settings.process); API.show.alert("update ranges", 2); API.event.emit("range.updates", ranges);