From fa4292fe118d71309aa7ca11a23788e22605914a Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Mon, 31 May 2021 17:57:31 +0200 Subject: [PATCH] Fix importing mask from project file --- Sources/arm/data/LayerSlot.hx | 2 +- Sources/arm/io/ImportArm.hx | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Sources/arm/data/LayerSlot.hx b/Sources/arm/data/LayerSlot.hx index 68ef13fd..5deed3d0 100644 --- a/Sources/arm/data/LayerSlot.hx +++ b/Sources/arm/data/LayerSlot.hx @@ -91,7 +91,7 @@ class LayerSlot { name = "Mask " + (id + 1); var format = "R8"; blending = BlendAdd; - objectMask = parent.objectMask; + if (parent != null) objectMask = parent.objectMask; { var t = new RenderTargetRaw(); diff --git a/Sources/arm/io/ImportArm.hx b/Sources/arm/io/ImportArm.hx index 78eb3747..1717a3fd 100644 --- a/Sources/arm/io/ImportArm.hx +++ b/Sources/arm/io/ImportArm.hx @@ -299,7 +299,12 @@ class ImportArm { // Assign parents to groups and masks for (i in 0...project.layer_datas.length) { var ld = project.layer_datas[i]; - if (ld.parent >= 0) Project.layers[i].parent = Project.layers[ld.parent]; + if (ld.parent >= 0) { + Project.layers[i].parent = Project.layers[ld.parent]; + if (Project.layers[i].isMask()) { + Project.layers[i].objectMask = Project.layers[i].parent.objectMask; + } + } } Context.setLayer(Project.layers[0]);