From 569b0441e4736df2b0002bc75907e71b2c12a47c Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Wed, 5 Feb 2025 14:55:41 -0800
Subject: [PATCH] Improvements to 'normalmap' upgrade logic

This changelist improves the upgrade logic for the `normalmap` node in v1.38 documents, extending support to nodes with explicit `nodedef` attributes, while maintaining support for nodes without them.

Two examples of v1.38 `normalmap` nodes have been added to the `TestSuite/stdlib/upgrade` folder for validation in unit testing.
---
 .../TestSuite/stdlib/upgrade/syntax_1_38.mtlx | 38 +++++++++++++++++++
 source/MaterialXCore/Version.cpp              |  7 +---
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 resources/Materials/TestSuite/stdlib/upgrade/syntax_1_38.mtlx

diff --git a/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_38.mtlx b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_38.mtlx
new file mode 100644
index 0000000000..575edbd800
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/upgrade/syntax_1_38.mtlx
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<materialx version="1.38">
+
+  <tiledimage name="N_tiledimage" type="vector3">
+    <input name="file" type="filename" value="resources/Images/mesh_wire_norm.png" />
+    <input name="uvtiling" type="vector2" value="8, 8" />
+  </tiledimage>
+
+  <normalmap name="N_normalmap_1" type="vector3" nodedef="ND_normalmap">
+    <input name="in" type="vector3" nodename="N_tiledimage" />
+  </normalmap>
+  <standard_surface name="N_surface_1" type="surfaceshader">
+    <input name="base_color" type="color3" value="1.0, 1.0, 1.0" />
+    <input name="specular_roughness" type="float" value="0" />
+    <input name="metalness" type="float" value="1" />
+    <input name="normal" type="vector3" nodename="N_normalmap_1" />
+  </standard_surface>
+  <surfacematerial name="N_material_1" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="N_surface_1" />
+  </surfacematerial>
+
+  <normalmap name="N_normalmap_2" type="vector3">
+    <input name="in" type="vector3" nodename="N_tiledimage" />
+    <input name="scale" type="float" value="1.1" />
+    <input name="space" type="string" value="tangent" />
+  </normalmap>
+  <standard_surface name="N_surface_2" type="surfaceshader">
+    <input name="base" type="float" value="0.6" />
+    <input name="metalness" type="float" value="1.0" />
+    <input name="specular" type="float" value="0.7" />
+    <input name="coat" type="float" value="1" />
+    <input name="normal" type="vector3" nodename="N_normalmap_2" />
+  </standard_surface>
+  <surfacematerial name="N_material_2" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="N_surface_2" />
+  </surfacematerial>
+
+</materialx>
diff --git a/source/MaterialXCore/Version.cpp b/source/MaterialXCore/Version.cpp
index a1a6e16d5b..e1b6604bc6 100644
--- a/source/MaterialXCore/Version.cpp
+++ b/source/MaterialXCore/Version.cpp
@@ -1316,11 +1316,8 @@ void Document::upgradeVersion()
             }
             else if (nodeCategory == "normalmap")
             {
-                // ND_normalmap was renamed to ND_normalmap_float
-                NodeDefPtr nodeDef = getShaderNodeDef(node);
-                InputPtr scaleInput = node->getInput("scale");
-                if ((nodeDef && nodeDef->getName() == "ND_normalmap") ||
-                    (scaleInput && scaleInput->getType() == "float"))
+                // Handle a rename of the float-typed nodedef.
+                if (node->getNodeDefString() == "ND_normalmap")
                 {
                     node->setNodeDefString("ND_normalmap_float");
                 }