From 667fbf0e455b825d668351a51282013d683cfb7d Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Fri, 24 Jan 2020 00:28:13 +0100
Subject: [PATCH] Show uv map of selected object

---
 Sources/arm/util/UVUtil.hx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Sources/arm/util/UVUtil.hx b/Sources/arm/util/UVUtil.hx
index f373a95e..66ccf4d8 100644
--- a/Sources/arm/util/UVUtil.hx
+++ b/Sources/arm/util/UVUtil.hx
@@ -1,6 +1,7 @@
 package arm.util;
 
 import kha.Image;
+import arm.ui.UITrait;
 
 class UVUtil {
 
@@ -18,8 +19,10 @@ class UVUtil {
 		}
 
 		uvmapCached = true;
-		var merged = Context.mergedObject != null ? Context.mergedObject.data.raw : Context.paintObject.data.raw;
-		var mesh = merged;
+		var merged = Context.mergedObject;
+		var mesh = (UITrait.inst.layerFilter == 0 && merged != null) ?
+					merged.data.raw : Context.paintObject.data.raw;
+
 		var texa = mesh.vertex_arrays[2].values;
 		var inda = mesh.index_arrays[0].values;
 		uvmap.g2.begin(true, 0x00000000);