From b73d9d82f535527a661e02bb3bc59586524a788b Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Thu, 19 Aug 2021 14:15:38 +0200 Subject: [PATCH] Fix material rename --- Sources/arm/ui/UINodes.hx | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/Sources/arm/ui/UINodes.hx b/Sources/arm/ui/UINodes.hx index f399a55a..ee026ea7 100644 --- a/Sources/arm/ui/UINodes.hx +++ b/Sources/arm/ui/UINodes.hx @@ -694,26 +694,31 @@ class UINodes { h.text = c.name; var newName = ui.textInput(h, "", Right); - if (h.changed && groupStack.length > 0) { // Check whether renaming is possible and update group links - var canRename = true; - for (m in Project.materialGroups) { - if (m.canvas.name == newName) canRename = false; // Name already used - } + if (h.changed) { // Check whether renaming is possible and update group links + if (groupStack.length > 0) { + var canRename = true; + for (m in Project.materialGroups) { + if (m.canvas.name == newName) canRename = false; // Name already used + } - if (canRename) { - var oldName = c.name; - c.name = newName; - var canvases: Array = []; - for (m in Project.materials) canvases.push(m.canvas); - for (m in Project.materialGroups) canvases.push(m.canvas); - for (canvas in canvases) { - for (n in canvas.nodes) { - if (n.type == "GROUP" && n.name == oldName) { - n.name = c.name; + if (canRename) { + var oldName = c.name; + c.name = newName; + var canvases: Array = []; + for (m in Project.materials) canvases.push(m.canvas); + for (m in Project.materialGroups) canvases.push(m.canvas); + for (canvas in canvases) { + for (n in canvas.nodes) { + if (n.type == "GROUP" && n.name == oldName) { + n.name = c.name; + } } } } } + else { + c.name = newName; + } } ui.t.ACCENT_COL = _ACCENT_COL; ui.t.BUTTON_H = _BUTTON_H;