From 6d672c62ed56c7ad056f90ded2fecfe4ca693067 Mon Sep 17 00:00:00 2001
From: vernalchen <shaochun.chen@autodesk.com>
Date: Mon, 11 Jul 2022 16:04:55 +0800
Subject: [PATCH 1/5] Provide a frame transform for UV texture coordinates

---
 libraries/stdlib/stdlib_defs.mtlx             | 15 ++++++++++
 libraries/stdlib/stdlib_ng.mtlx               | 30 +++++++++++++++++++
 .../TestSuite/stdlib/math/transform.mtlx      | 14 +++++++++
 3 files changed, 59 insertions(+)

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index f52ac0f300..326ded860e 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -2333,6 +2333,7 @@
   <!--
     Node: <place2d> Supplemental Node
     Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, scale, rotate, translate, pivot.
   -->
   <nodedef name="ND_place2d_vector2" node="place2d" nodegroup="math">
     <input name="texcoord" type="vector2" value="0.0, 0.0" />
@@ -2343,6 +2344,20 @@
     <output name="out" type="vector2" defaultinput="texcoord" />
   </nodedef>
 
+  <!--
+    Node: <place2dframe> Supplemental Node
+    Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, translate, rotate, scale, pivot.
+  -->
+  <nodedef name="ND_place2dframe_vector2" node="place2dframe" nodegroup="math">
+    <input name="texcoord" type="vector2" value="0.0, 0.0" />
+    <input name="pivot" type="vector2" value="0.0,0.0" />
+    <input name="scale" type="vector2" value="1.0,1.0" />
+    <input name="rotate" type="float" value="0.0" unittype="angle" unit="degree" />
+    <input name="offset" type="vector2" value="0.0,0.0" />
+    <output name="out" type="vector2" defaultinput="texcoord" />
+  </nodedef>
+
   <!--
     Node: <arrayappend>
     Creates a two-element array from two base types, or appends a base-type value to an array of
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index c96dcb41bb..090b8fd857 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1046,6 +1046,7 @@
   <!--
     Node: <place2d>
     Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, scale, rotate, translate, pivot.
   -->
   <nodegraph name="NG_place2d_vector2" nodedef="ND_place2d_vector2">
     <subtract name="N_subpivot" type="vector2">
@@ -1071,6 +1072,35 @@
     <output name="out" type="vector2" nodename="N_addpivot" />
   </nodegraph>
 
+  <!--
+    Node: <place2dframe>
+    Transform incoming UV texture coordinates for 2D texture placement.
+    Sequence of transformation (in the order of application): -pivot, translate, rotate, scale, pivot.
+  -->
+  <nodegraph name="NG_place2dframe_vector2" nodedef="ND_place2dframe_vector2">
+    <subtract name="N_subpivot" type="vector2">
+      <input name="in1" type="vector2" interfacename="texcoord" />
+      <input name="in2" type="vector2" interfacename="pivot" />
+    </subtract>
+    <subtract name="N_applyoffset" type="vector2">
+      <input name="in1" type="vector2" nodename="N_subpivot" />
+      <input name="in2" type="vector2" interfacename="offset" />
+    </subtract>
+    <rotate2d name="N_applyrot" type="vector2">
+      <input name="in" type="vector2" nodename="N_applyoffset" />
+      <input name="amount" type="float" interfacename="rotate" />
+    </rotate2d>
+    <divide name="N_applyscale" type="vector2">
+      <input name="in1" type="vector2" nodename="N_applyrot" />
+      <input name="in2" type="vector2" interfacename="scale" />
+    </divide>
+    <add name="N_addpivot" type="vector2">
+      <input name="in1" type="vector2" nodename="N_applyscale" />
+      <input name="in2" type="vector2" interfacename="pivot" />
+    </add>
+    <output name="out" type="vector2" nodename="N_addpivot" />
+  </nodegraph>
+
   <!-- ======================================================================== -->
   <!-- Adjustment nodes                                                         -->
   <!-- ======================================================================== -->
diff --git a/resources/Materials/TestSuite/stdlib/math/transform.mtlx b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
index 042f320c84..1fa31a5a50 100644
--- a/resources/Materials/TestSuite/stdlib/math/transform.mtlx
+++ b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
@@ -178,4 +178,18 @@
     </place2d>
     <output name="out" type="vector2" nodename="place2d1_1" />
   </nodegraph>
+  <!-- place2dframe -->
+  <nodegraph name="place2dframe_vector2">
+    <texcoord name="texcoord1" type="vector2">
+      <input name="index" type="integer" value="0" />
+    </texcoord>
+    <place2dframe name="place2d1_1" type="vector2">
+      <input name="texcoord" type="vector2" nodename="texcoord1" />
+      <input name="pivot" type="vector2" value="0.5,0.5" />
+      <input name="scale" type="vector2" value="2.0,1.0" />
+      <input name="rotate" type="float" value="1.0" unittype="angle" unit="radian" />
+      <input name="offset" type="vector2" value="0.2,0.2" />
+    </place2dframe>
+    <output name="out" type="vector2" nodename="place2d1_1" />
+  </nodegraph>
 </materialx>

From e356b7674aa7a413daf1b6daf0036235c6a67341 Mon Sep 17 00:00:00 2001
From: vernalchen <shaochun.chen@autodesk.com>
Date: Wed, 13 Jul 2022 13:33:30 +0800
Subject: [PATCH 2/5] Refine wording & add test cases

---
 libraries/stdlib/stdlib_defs.mtlx             | 17 +++------
 libraries/stdlib/stdlib_ng.mtlx               | 14 ++++----
 .../stdlib/texture/image_transform.mtlx       | 35 +++++++++++++++++++
 3 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 326ded860e..1b64e2880d 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -2332,8 +2332,8 @@
 
   <!--
     Node: <place2d> Supplemental Node
-    Transform incoming UV texture coordinates for 2D texture placement.
-    Sequence of transformation (in the order of application): -pivot, scale, rotate, translate, pivot.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -pivot, scale, rotate, translate, pivot.
   -->
   <nodedef name="ND_place2d_vector2" node="place2d" nodegroup="math">
     <input name="texcoord" type="vector2" value="0.0, 0.0" />
@@ -2346,17 +2346,10 @@
 
   <!--
     Node: <place2dframe> Supplemental Node
-    Transform incoming UV texture coordinates for 2D texture placement.
-    Sequence of transformation (in the order of application): -pivot, translate, rotate, scale, pivot.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -pivot, translate, rotate, scale, pivot.
   -->
-  <nodedef name="ND_place2dframe_vector2" node="place2dframe" nodegroup="math">
-    <input name="texcoord" type="vector2" value="0.0, 0.0" />
-    <input name="pivot" type="vector2" value="0.0,0.0" />
-    <input name="scale" type="vector2" value="1.0,1.0" />
-    <input name="rotate" type="float" value="0.0" unittype="angle" unit="degree" />
-    <input name="offset" type="vector2" value="0.0,0.0" />
-    <output name="out" type="vector2" defaultinput="texcoord" />
-  </nodedef>
+  <nodedef name="ND_place2dframe_vector2" node="place2dframe" inherit="ND_place2d_vector2" />
 
   <!--
     Node: <arrayappend>
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index 090b8fd857..fba360d8dd 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1045,10 +1045,11 @@
 
   <!--
     Node: <place2d>
-    Transform incoming UV texture coordinates for 2D texture placement.
-    Sequence of transformation (in the order of application): -pivot, scale, rotate, translate, pivot.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -pivot, scale, rotate, translate, pivot.
   -->
-  <nodegraph name="NG_place2d_vector2" nodedef="ND_place2d_vector2">
+  <implementation name="IMPL_place2d_vector2" nodedef="ND_place2d_vector2" nodegraph="NG_place2d_vector2" />
+  <nodegraph name="NG_place2d_vector2">
     <subtract name="N_subpivot" type="vector2">
       <input name="in1" type="vector2" interfacename="texcoord" />
       <input name="in2" type="vector2" interfacename="pivot" />
@@ -1074,10 +1075,11 @@
 
   <!--
     Node: <place2dframe>
-    Transform incoming UV texture coordinates for 2D texture placement.
-    Sequence of transformation (in the order of application): -pivot, translate, rotate, scale, pivot.
+    Transform incoming UV texture coordinates from one 2D frame of reference to another.
+    The order of transformation is: -pivot, translate, rotate, scale, pivot.
   -->
-  <nodegraph name="NG_place2dframe_vector2" nodedef="ND_place2dframe_vector2">
+  <implementation name="IMPL_place2dframe_vector2" nodedef="ND_place2dframe_vector2" nodegraph="NG_place2dframe_vector2" />
+  <nodegraph name="NG_place2dframe_vector2">
     <subtract name="N_subpivot" type="vector2">
       <input name="in1" type="vector2" interfacename="texcoord" />
       <input name="in2" type="vector2" interfacename="pivot" />
diff --git a/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
new file mode 100644
index 0000000000..33a78bca2e
--- /dev/null
+++ b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<materialx version="1.38">
+  <nodegraph name="test_place2d">
+    <image name="image_number_1" type="color3">
+      <input name="file" type="filename" value="resources/Images/grid.png" />
+      <input name="default" type="color3" value="1.0, 0.0, 0.0" />
+      <input name="texcoord" type="vector2" nodename="a_place2d" />
+    </image>
+    <output name="out" type="color3" nodename="image_number_1" />
+    <texcoord name="texcoord1" type="vector2" />
+    <place2d name="a_place2d" type="vector2">
+      <input name="texcoord" type="vector2" nodename="texcoord1" />
+      <input name="offset" type="vector2" value="0.0, 0.0" />
+      <input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
+      <input name="scale" type="vector2" value="2.0, 1.0" />
+      <input name="pivot" type="vector2" value="0.5, 0.5" />
+    </place2d>
+  </nodegraph>
+  <nodegraph name="test_place2dframe">
+    <image name="image_number_1" type="color3">
+      <input name="file" type="filename" value="resources/Images/grid.png" />
+      <input name="default" type="color3" value="1.0, 0.0, 0.0" />
+      <input name="texcoord" type="vector2" nodename="a_place2d" />
+    </image>
+    <output name="out" type="color3" nodename="image_number_1" />
+    <texcoord name="texcoord1" type="vector2" />
+    <place2dframe name="a_place2d" type="vector2">
+      <input name="texcoord" type="vector2" nodename="texcoord1" />
+      <input name="offset" type="vector2" value="0.2, 0.2" />
+      <input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
+      <input name="scale" type="vector2" value="2.0, 1.0" />
+      <input name="pivot" type="vector2" value="0.5, 0.5" />
+    </place2dframe>
+  </nodegraph>
+</materialx>

From c8b2b3df3511932ff75d6b2aeab7c4f93194670f Mon Sep 17 00:00:00 2001
From: vernalchen <shaochun.chen@autodesk.com>
Date: Tue, 26 Jul 2022 17:28:42 +0800
Subject: [PATCH 3/5] add the new funtionality into place2d

---
 libraries/stdlib/stdlib_defs.mtlx             | 14 +++---
 libraries/stdlib/stdlib_ng.mtlx               | 44 ++++++++-----------
 .../TestSuite/stdlib/math/transform.mtlx      | 15 +------
 .../stdlib/texture/image_transform.mtlx       | 10 +++--
 4 files changed, 32 insertions(+), 51 deletions(-)

diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 1b64e2880d..000344868c 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -2333,7 +2333,11 @@
   <!--
     Node: <place2d> Supplemental Node
     Transform incoming UV texture coordinates from one 2D frame of reference to another.
-    The order of transformation is: -pivot, scale, rotate, translate, pivot.
+    operationorder (integer enum): the order in which to perform the transform operations.
+    "0" or "SRT" performs -pivot, scale, rotate, translate, +pivot as per the original
+    implementation matching the behavior of certain DCC packages, and "1" or "TRS" performs
+    -pivot, translate, rotate, scale, +pivot which does not introduce texture shear.
+    Default is 0 "SRT" for backward compatibility.
   -->
   <nodedef name="ND_place2d_vector2" node="place2d" nodegroup="math">
     <input name="texcoord" type="vector2" value="0.0, 0.0" />
@@ -2341,16 +2345,10 @@
     <input name="scale" type="vector2" value="1.0,1.0" />
     <input name="rotate" type="float" value="0.0" unittype="angle" unit="degree" />
     <input name="offset" type="vector2" value="0.0,0.0" />
+    <input name="operationorder" type="integer" value="0" enum="SRT, TRS" enumvalues="0, 1" />
     <output name="out" type="vector2" defaultinput="texcoord" />
   </nodedef>
 
-  <!--
-    Node: <place2dframe> Supplemental Node
-    Transform incoming UV texture coordinates from one 2D frame of reference to another.
-    The order of transformation is: -pivot, translate, rotate, scale, pivot.
-  -->
-  <nodedef name="ND_place2dframe_vector2" node="place2dframe" inherit="ND_place2d_vector2" />
-
   <!--
     Node: <arrayappend>
     Creates a two-element array from two base types, or appends a base-type value to an array of
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index fba360d8dd..e650f6af8f 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1046,10 +1046,13 @@
   <!--
     Node: <place2d>
     Transform incoming UV texture coordinates from one 2D frame of reference to another.
-    The order of transformation is: -pivot, scale, rotate, translate, pivot.
+    operationorder (integer enum): the order in which to perform the transform operations.
+    "0" or "SRT" performs -pivot, scale, rotate, translate, +pivot as per the original
+    implementation matching the behavior of certain DCC packages, and "1" or "TRS" performs
+    -pivot, translate, rotate, scale, +pivot which does not introduce texture shear.
+    Default is 0 "SRT" for backward compatibility.
   -->
-  <implementation name="IMPL_place2d_vector2" nodedef="ND_place2d_vector2" nodegraph="NG_place2d_vector2" />
-  <nodegraph name="NG_place2d_vector2">
+  <nodegraph name="NG_place2d_vector2" nodedef="ND_place2d_vector2">
     <subtract name="N_subpivot" type="vector2">
       <input name="in1" type="vector2" interfacename="texcoord" />
       <input name="in2" type="vector2" interfacename="pivot" />
@@ -1070,37 +1073,28 @@
       <input name="in1" type="vector2" nodename="N_applyoffset" />
       <input name="in2" type="vector2" interfacename="pivot" />
     </add>
-    <output name="out" type="vector2" nodename="N_addpivot" />
-  </nodegraph>
-
-  <!--
-    Node: <place2dframe>
-    Transform incoming UV texture coordinates from one 2D frame of reference to another.
-    The order of transformation is: -pivot, translate, rotate, scale, pivot.
-  -->
-  <implementation name="IMPL_place2dframe_vector2" nodedef="ND_place2dframe_vector2" nodegraph="NG_place2dframe_vector2" />
-  <nodegraph name="NG_place2dframe_vector2">
-    <subtract name="N_subpivot" type="vector2">
-      <input name="in1" type="vector2" interfacename="texcoord" />
-      <input name="in2" type="vector2" interfacename="pivot" />
-    </subtract>
-    <subtract name="N_applyoffset" type="vector2">
+    <subtract name="N_applyoffset2" type="vector2">
       <input name="in1" type="vector2" nodename="N_subpivot" />
       <input name="in2" type="vector2" interfacename="offset" />
     </subtract>
-    <rotate2d name="N_applyrot" type="vector2">
-      <input name="in" type="vector2" nodename="N_applyoffset" />
+    <rotate2d name="N_applyrot2" type="vector2">
+      <input name="in" type="vector2" nodename="N_applyoffset2" />
       <input name="amount" type="float" interfacename="rotate" />
     </rotate2d>
-    <divide name="N_applyscale" type="vector2">
-      <input name="in1" type="vector2" nodename="N_applyrot" />
+    <divide name="N_applyscale2" type="vector2">
+      <input name="in1" type="vector2" nodename="N_applyrot2" />
       <input name="in2" type="vector2" interfacename="scale" />
     </divide>
-    <add name="N_addpivot" type="vector2">
-      <input name="in1" type="vector2" nodename="N_applyscale" />
+    <add name="N_addpivot2" type="vector2">
+      <input name="in1" type="vector2" nodename="N_applyscale2" />
       <input name="in2" type="vector2" interfacename="pivot" />
     </add>
-    <output name="out" type="vector2" nodename="N_addpivot" />
+    <switch name="N_switch_operationorder" type="vector2">
+      <input name="in1" type="vector2" nodename="N_addpivot" />
+      <input name="in2" type="vector2" nodename="N_addpivot2" />
+      <input name="which" type="integer" interfacename="operationorder" />
+    </switch>
+    <output name="out" type="vector2" nodename="N_switch_operationorder" />
   </nodegraph>
 
   <!-- ======================================================================== -->
diff --git a/resources/Materials/TestSuite/stdlib/math/transform.mtlx b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
index 1fa31a5a50..45ef4ee096 100644
--- a/resources/Materials/TestSuite/stdlib/math/transform.mtlx
+++ b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
@@ -175,21 +175,8 @@
       <input name="scale" type="vector2" value="2.0,2.0" />
       <input name="rotate" type="float" value="1.0" unittype="angle" unit="radian" />
       <input name="offset" type="vector2" value="0.2,0.2" />
+      <input name="operationorder" type="integer" value="0" />
     </place2d>
     <output name="out" type="vector2" nodename="place2d1_1" />
   </nodegraph>
-  <!-- place2dframe -->
-  <nodegraph name="place2dframe_vector2">
-    <texcoord name="texcoord1" type="vector2">
-      <input name="index" type="integer" value="0" />
-    </texcoord>
-    <place2dframe name="place2d1_1" type="vector2">
-      <input name="texcoord" type="vector2" nodename="texcoord1" />
-      <input name="pivot" type="vector2" value="0.5,0.5" />
-      <input name="scale" type="vector2" value="2.0,1.0" />
-      <input name="rotate" type="float" value="1.0" unittype="angle" unit="radian" />
-      <input name="offset" type="vector2" value="0.2,0.2" />
-    </place2dframe>
-    <output name="out" type="vector2" nodename="place2d1_1" />
-  </nodegraph>
 </materialx>
diff --git a/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
index 33a78bca2e..939f053b3c 100644
--- a/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
+++ b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <materialx version="1.38">
-  <nodegraph name="test_place2d">
+  <nodegraph name="test_place2d_SRT">
     <image name="image_number_1" type="color3">
       <input name="file" type="filename" value="resources/Images/grid.png" />
       <input name="default" type="color3" value="1.0, 0.0, 0.0" />
@@ -14,9 +14,10 @@
       <input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
       <input name="scale" type="vector2" value="2.0, 1.0" />
       <input name="pivot" type="vector2" value="0.5, 0.5" />
+      <input name="operationorder" type="integer" value="0" />
     </place2d>
   </nodegraph>
-  <nodegraph name="test_place2dframe">
+  <nodegraph name="test_place2d_TRS">
     <image name="image_number_1" type="color3">
       <input name="file" type="filename" value="resources/Images/grid.png" />
       <input name="default" type="color3" value="1.0, 0.0, 0.0" />
@@ -24,12 +25,13 @@
     </image>
     <output name="out" type="color3" nodename="image_number_1" />
     <texcoord name="texcoord1" type="vector2" />
-    <place2dframe name="a_place2d" type="vector2">
+    <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1" />
       <input name="offset" type="vector2" value="0.2, 0.2" />
       <input name="rotate" type="float" value="30.0" unittype="angle" unit="degree" />
       <input name="scale" type="vector2" value="2.0, 1.0" />
       <input name="pivot" type="vector2" value="0.5, 0.5" />
-    </place2dframe>
+      <input name="operationorder" type="integer" value="1" />
+    </place2d>
   </nodegraph>
 </materialx>

From 9d80a2f2dcfb4e8b08bad05dd5a1c310830df57a Mon Sep 17 00:00:00 2001
From: vernalchen <shaochun.chen@autodesk.com>
Date: Wed, 27 Jul 2022 09:51:55 +0800
Subject: [PATCH 4/5] leverage the default value

---
 resources/Materials/TestSuite/stdlib/math/transform.mtlx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/Materials/TestSuite/stdlib/math/transform.mtlx b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
index 45ef4ee096..042f320c84 100644
--- a/resources/Materials/TestSuite/stdlib/math/transform.mtlx
+++ b/resources/Materials/TestSuite/stdlib/math/transform.mtlx
@@ -175,7 +175,6 @@
       <input name="scale" type="vector2" value="2.0,2.0" />
       <input name="rotate" type="float" value="1.0" unittype="angle" unit="radian" />
       <input name="offset" type="vector2" value="0.2,0.2" />
-      <input name="operationorder" type="integer" value="0" />
     </place2d>
     <output name="out" type="vector2" nodename="place2d1_1" />
   </nodegraph>

From 8cac5aebb3d655e7c992d0704fb11ef2e606866a Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Sun, 31 Jul 2022 13:40:07 -0700
Subject: [PATCH 5/5] Clarify node order in test material

---
 .../stdlib/texture/image_transform.mtlx          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
index 939f053b3c..a3afd60912 100644
--- a/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
+++ b/resources/Materials/TestSuite/stdlib/texture/image_transform.mtlx
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 <materialx version="1.38">
   <nodegraph name="test_place2d_SRT">
-    <image name="image_number_1" type="color3">
-      <input name="file" type="filename" value="resources/Images/grid.png" />
-      <input name="default" type="color3" value="1.0, 0.0, 0.0" />
-      <input name="texcoord" type="vector2" nodename="a_place2d" />
-    </image>
-    <output name="out" type="color3" nodename="image_number_1" />
     <texcoord name="texcoord1" type="vector2" />
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1" />
@@ -16,14 +10,14 @@
       <input name="pivot" type="vector2" value="0.5, 0.5" />
       <input name="operationorder" type="integer" value="0" />
     </place2d>
-  </nodegraph>
-  <nodegraph name="test_place2d_TRS">
     <image name="image_number_1" type="color3">
       <input name="file" type="filename" value="resources/Images/grid.png" />
       <input name="default" type="color3" value="1.0, 0.0, 0.0" />
       <input name="texcoord" type="vector2" nodename="a_place2d" />
     </image>
     <output name="out" type="color3" nodename="image_number_1" />
+  </nodegraph>
+  <nodegraph name="test_place2d_TRS">
     <texcoord name="texcoord1" type="vector2" />
     <place2d name="a_place2d" type="vector2">
       <input name="texcoord" type="vector2" nodename="texcoord1" />
@@ -33,5 +27,11 @@
       <input name="pivot" type="vector2" value="0.5, 0.5" />
       <input name="operationorder" type="integer" value="1" />
     </place2d>
+    <image name="image_number_1" type="color3">
+      <input name="file" type="filename" value="resources/Images/grid.png" />
+      <input name="default" type="color3" value="1.0, 0.0, 0.0" />
+      <input name="texcoord" type="vector2" nodename="a_place2d" />
+    </image>
+    <output name="out" type="color3" nodename="image_number_1" />
   </nodegraph>
 </materialx>