From eefcb26bd404d1ec79ee10659d6141ff265a093f Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Wed, 13 Nov 2019 22:17:17 +0100
Subject: [PATCH] Cleanup

---
 Sources/arm/node/Material.hx | 21 +++++----------------
 Sources/arm/ui/UITrait.hx    |  9 +++++----
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Sources/arm/node/Material.hx b/Sources/arm/node/Material.hx
index a1de143d..3ca61985 100644
--- a/Sources/arm/node/Material.hx
+++ b/Sources/arm/node/Material.hx
@@ -1737,31 +1737,20 @@ class Material {
 	//
 
 	static function make_texture(image_node:TNode, tex_name:String, matname:String = null):TBindTexture {
+		var filepath = image_node.buttons[0].data;
+		if (filepath == '' || filepath.indexOf('.') == -1) {
+			return null;
+		}
 
 		var tex:TBindTexture = {
 			name: tex_name,
-			file: ''
+			file: filepath
 		};
-
-		var filepath = image_node.buttons[0].data;
-		if (filepath == '') {
-			return null;
-		}
-
-		tex.file = filepath;
-
-		var s = tex.file.split('.');
-		if (s.length == 1) {
-			return null;
-		}
-
-		var interpolation = 'Smart';
 		tex.min_filter = 'anisotropic';
 		tex.mipmap_filter = 'linear';
 		tex.generate_mipmaps = true;
 		tex.u_addressing = 'repeat';
 		tex.v_addressing = 'repeat';
-
 		return tex;
 	}
 
diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx
index 03543786..d9635f94 100644
--- a/Sources/arm/ui/UITrait.hx
+++ b/Sources/arm/ui/UITrait.hx
@@ -909,10 +909,11 @@ class UITrait {
 			var BUTTON_COL = ui.t.BUTTON_COL;
 			ui.t.BUTTON_COL = ui.t.SEPARATOR_COL;
 
-			if (ui.button("File", Left) || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 0; };
-			if (ui.button("Edit", Left) || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 1; };
-			if (ui.button("View", Left) || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 2; };
-			if (ui.button("Help", Left) || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 3; };
+			if (ui.button("File") || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 0; };
+			if (ui.button("Edit") || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 1; };
+			if (ui.button("Camera") || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 2; };
+			if (ui.button("View") || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 3; };
+			if (ui.button("Help") || (UIMenu.show && ui.isHovered)) { UIMenu.show = true; UIMenu.menuCategory = 4; };
 
 			ui._w = _w;
 			ui.t.ELEMENT_OFFSET = ELEMENT_OFFSET;