Cleanup

Sources/arm/Plugin.hx

@@ -95,6 +95,7 @@ class ArmBridge {
 	public static var UINodes = arm.ui.UINodes;
 	public static var UIFiles = arm.ui.UIFiles;
 	public static var UIMenu = arm.ui.UIMenu;
+	public static var UIView2D = arm.ui.UIView2D;
 	public static var MeshUtil = arm.util.MeshUtil;
 	public static var MaterialUtil = arm.util.MaterialUtil;
 	public static var RenderUtil = arm.util.RenderUtil;

Sources/arm/ui/TabLayers.hx

@@ -208,11 +208,11 @@ class TabLayers {
 						state = ui.image(l.fill_mask.imageIcon, 0xffffffff, (ui.ELEMENT_H() - 3) * 2);
 					}
 					else {
-						ui.g.pipeline = UIView2D.inst.pipe;
+						ui.g.pipeline = UIView2D.pipe;
 						#if kha_opengl
-						ui.currentWindow.texture.g4.setPipeline(UIView2D.inst.pipe);
+						ui.currentWindow.texture.g4.setPipeline(UIView2D.pipe);
 						#end
-						ui.currentWindow.texture.g4.setInt(UIView2D.inst.channelLocation, 1);
+						ui.currentWindow.texture.g4.setInt(UIView2D.channelLocation, 1);
 						state = ui.image(l.texpaint_mask_preview, 0xffffffff, (ui.ELEMENT_H() - 3) * 2);
 						ui.g.pipeline = null;
 					}

Sources/arm/ui/UIView2D.hx

@@ -15,10 +15,11 @@ import arm.util.RenderUtil;
 import arm.render.RenderPathPaint;
 import arm.Enums;
 
-@:access(zui.Zui)
 class UIView2D {
 
 	public static var inst: UIView2D;
+	public static var pipe: PipelineState;
+	public static var channelLocation: ConstantLocation;
 	public var show = false;
 	public var type = View2DLayer;
 	public var wx: Int;
@@ -30,8 +31,6 @@ class UIView2D {
 	public var panX = 0.0;
 	public var panY = 0.0;
 	public var panScale = 1.0;
-	public var pipe: PipelineState;
-	public var channelLocation: ConstantLocation;
 	var texType = TexBase;
 	var uvmapShow = false;
 	var tiledShow = false;
@@ -58,6 +57,7 @@ class UIView2D {
 		ui.scrollEnabled = false;
 	}
 
+	@:access(zui.Zui)
 	public function render(g: kha.graphics2.Graphics) {
 		ww = Config.raw.layout[LayoutNodesW];
 		wx = Std.int(iron.App.w()) + UIToolbar.inst.toolbarw;