mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Added check for merge with next layer

Browse Source
This commit is contained in:
Joren Dandois
2020-07-04 01:50:14 +02:00
parent 250f1be0eb
commit 3b623c7165
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/controller/piskel/PiskelController.js
View File

@@ -294,6 +294,10 @@
ns.PiskelController.prototype.mergeDownLayerAt = function (index) {
var layer = this.getLayerByIndex(index);
var downLayer = this.getLayerByIndex(index - 1);
if (layer.locked || downLayer.locked) {
window.console.error('Could not merge with later below. One of the layers is locked.');
return;
}
if (layer && downLayer) {
var mergedLayer = pskl.utils.LayerUtils.mergeLayers(layer, downLayer);
this.removeLayerAt(index);