From 38b54d68d6685e463f4c270015b896ee490918ba Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Fri, 24 Jan 2020 00:26:13 +0100
Subject: [PATCH] Fix fill layer init

---
 Sources/arm/ui/TabLayers.hx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Sources/arm/ui/TabLayers.hx b/Sources/arm/ui/TabLayers.hx
index 080a272f..9025ecd4 100644
--- a/Sources/arm/ui/TabLayers.hx
+++ b/Sources/arm/ui/TabLayers.hx
@@ -41,6 +41,7 @@ class TabLayers {
 					p.visible = UITrait.inst.layerFilter == 0 || p.name == ar[UITrait.inst.layerFilter];
 					Layers.setObjectMask();
 				}
+				UVUtil.uvmapCached = false;
 				Context.ddirty = 2;
 			}
 
@@ -364,14 +365,16 @@ class TabLayers {
 					l.objectMask = ui.combo(h, ar, "Object");
 					if (h.changed) {
 						Context.setLayer(l);
+						MaterialParser.parseMeshMaterial();
 						if (l.material_mask != null) { // Fill layer
 							iron.App.notifyOnRender(l.clear);
-							iron.App.notifyOnRender(function(_){
+							function updateFillLayers(_) {
 								Layers.updateFillLayers(4);
-							});
+								iron.App.removeRender(updateFillLayers);
+							}
+							iron.App.notifyOnRender(updateFillLayers);
 						}
 						else {
-							MaterialParser.parseMeshMaterial();
 							Layers.setObjectMask();
 						}
 					}