From 72e8d74957bdbdf0603a5f16f4edbc8b1b0476b4 Mon Sep 17 00:00:00 2001 From: Bigrat Enthusiast <77901819+bigratenthusiast@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:18:32 -0400 Subject: [PATCH] Make merged layer take name of lower layer Most of the time when merging layers, you'll want to keep the name of the Bottom layer. This saves users the trouble of having to rename the layer. --- src/js/utils/LayerUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/utils/LayerUtils.js b/src/js/utils/LayerUtils.js index 6affb34d..3162c88d 100644 --- a/src/js/utils/LayerUtils.js +++ b/src/js/utils/LayerUtils.js @@ -17,7 +17,7 @@ var otherFrame = framesB[index]; mergedFrames.push(pskl.utils.FrameUtils.merge([otherFrame, frame])); }); - var mergedLayer = pskl.model.Layer.fromFrames(layerA.getName(), mergedFrames); + var mergedLayer = pskl.model.Layer.fromFrames(layerB.getName(), mergedFrames); return mergedLayer; },