From e64537adcfb677dfb0435b33271786270af1689f Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sun, 30 Jun 2019 18:43:08 +0200 Subject: [PATCH] Fix material data ref --- Sources/arm/io/ImportBlend.hx | 2 +- Sources/arm/io/ImportFolder.hx | 2 +- Sources/arm/util/Path.hx | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Sources/arm/io/ImportBlend.hx b/Sources/arm/io/ImportBlend.hx index ccd22afe..c2972650 100644 --- a/Sources/arm/io/ImportBlend.hx +++ b/Sources/arm/io/ImportBlend.hx @@ -191,7 +191,7 @@ class ImportBlend { for (mat in mats) { // Material slot - Context.material = new MaterialSlot(); + Context.material = new MaterialSlot(Project.materials[0].data); Project.materials.push(Context.material); UINodes.inst.updateCanvasMap(); var nodes = UINodes.inst.nodes; diff --git a/Sources/arm/io/ImportFolder.hx b/Sources/arm/io/ImportFolder.hx index c5cfd80e..aaaad8f4 100644 --- a/Sources/arm/io/ImportFolder.hx +++ b/Sources/arm/io/ImportFolder.hx @@ -97,7 +97,7 @@ class ImportFolder { }); } else { - Context.material = new MaterialSlot(); + Context.material = new MaterialSlot(Project.materials[0].data); Project.materials.push(Context.material); } UINodes.inst.updateCanvasMap(); diff --git a/Sources/arm/util/Path.hx b/Sources/arm/util/Path.hx index 9d5992c8..1b3742f0 100644 --- a/Sources/arm/util/Path.hx +++ b/Sources/arm/util/Path.hx @@ -71,8 +71,7 @@ class Path { public static function checkOpacTex(p:String):Bool { return p.endsWith("_opac") || p.endsWith("_alpha") || - p.endsWith("_opacity") || - p.endsWith("_mask"); + p.endsWith("_opacity"); } public static function checkNorTex(p:String):Bool {