From a7fdc07f6ea9b601c365057e8557e8ddb3036e3d Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Sun, 22 Mar 2020 16:20:52 +0100
Subject: [PATCH] Apply mask to normal map

---
 Sources/arm/node/MakeMesh.hx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Sources/arm/node/MakeMesh.hx b/Sources/arm/node/MakeMesh.hx
index 4c0fe974..94610a10 100644
--- a/Sources/arm/node/MakeMesh.hx
+++ b/Sources/arm/node/MakeMesh.hx
@@ -111,6 +111,11 @@ class MakeMesh {
 				}
 				frag.write('basecol = texpaint_sample.rgb * texpaint_sample.a;');
 
+				if (l.texpaint_mask != null) {
+					frag.add_shared_sampler('sampler2D texpaint_mask');
+					frag.write('float maskTexture = textureLodShared(texpaint_mask, texCoord, 0.0).r;');
+				}
+
 				if (l.paintNor || MaterialBuilder.emisUsed) {
 					frag.add_shared_sampler('sampler2D texpaint_nor');
 					frag.write('vec4 texpaint_nor_sample = textureLodShared(texpaint_nor, texCoord, 0.0);');
@@ -123,6 +128,9 @@ class MakeMesh {
 						frag.write('vec3 ntex = texpaint_nor_sample.rgb;');
 						frag.write('n = ntex * 2.0 - 1.0;');
 						frag.write('n.y = -n.y;');
+						if (l.texpaint_mask != null) {
+							frag.write('n.xy *= maskTexture;');
+						}
 						frag.write('n = normalize(mul(n, TBN));');
 					}
 				}
@@ -188,8 +196,6 @@ class MakeMesh {
 				}
 
 				if (l.texpaint_mask != null) {
-					frag.add_shared_sampler('sampler2D texpaint_mask');
-					frag.write('float maskTexture = textureLodShared(texpaint_mask, texCoord, 0.0).r;');
 					frag.write('basecol *= maskTexture;');
 					frag.write('occlusion *= maskTexture;');
 					frag.write('roughness *= maskTexture;');