diff --git a/Env/topanda.hdr b/Env/topanda.hdr new file mode 100644 index 00000000..ae91c18f Binary files /dev/null and b/Env/topanda.hdr differ diff --git a/Sources/arm/UINodes.hx b/Sources/arm/UINodes.hx index 3c1b5424..ff290a3b 100644 --- a/Sources/arm/UINodes.hx +++ b/Sources/arm/UINodes.hx @@ -86,7 +86,6 @@ class UINodes extends armory.Trait { if (frame == 8) parseMaterial(); // Temp cpp fix frame++; - // var mouse = iron.system.Input.getMouse(); mreleased = mouse.released(); @@ -94,9 +93,7 @@ class UINodes extends armory.Trait { if (ui.changed) { mchanged = true; - if (!mdown) { - changed = true; - } + if (!mdown) changed = true; } if ((mreleased && mchanged) || changed) { mchanged = changed = false; @@ -104,7 +101,6 @@ class UINodes extends armory.Trait { } // - if (!show) return; if (!UITrait.uienabled) return; var keyboard = iron.system.Input.getKeyboard(); @@ -138,11 +134,8 @@ class UINodes extends armory.Trait { } public static var nodes = new Nodes(); - static var canvas:TNodeCanvas = null; - static var bg:kha.Image = null; - function getNodeX():Int { var mouse = iron.system.Input.getMouse(); return Std.int((mouse.x - wx - nodes.PAN_X()) / nodes.SCALE); @@ -180,7 +173,6 @@ class UINodes extends armory.Trait { @:access(zui.Zui) function render2D(g:kha.graphics2.Graphics) { - if (!show) return; if (!UITrait.uienabled && ui.inputRegistered) ui.unregisterInput(); diff --git a/Sources/arm/UITrait.hx b/Sources/arm/UITrait.hx index 0f8e872f..f7a6e62b 100644 --- a/Sources/arm/UITrait.hx +++ b/Sources/arm/UITrait.hx @@ -195,6 +195,7 @@ class UITrait extends armory.Trait { function importAsset(path:String) { if (!checkImageFormat(path)) { showMessage("Error: Unknown asset format"); + return; } iron.data.Data.getImage(path, function(image:kha.Image) { diff --git a/armorpaint.blend b/armorpaint.blend index 193961dc..caea389c 100644 Binary files a/armorpaint.blend and b/armorpaint.blend differ