diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 8c4b5b4150..45e804121c 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -307,6 +307,7 @@
     <input name="default" type="float" value="0.0" />
     <input name="position" type="vector3" defaultgeomprop="Pobject" />
     <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+    <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
     <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
     <input name="framerange" type="string" value="" uniform="true" />
@@ -324,6 +325,7 @@
     <input name="default" type="color3" value="0.0, 0.0, 0.0" />
     <input name="position" type="vector3" defaultgeomprop="Pobject" />
     <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+    <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
     <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
     <input name="framerange" type="string" value="" uniform="true" />
@@ -341,6 +343,7 @@
     <input name="default" type="color4" value="0.0, 0.0, 0.0, 0.0" />
     <input name="position" type="vector3" defaultgeomprop="Pobject" />
     <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+    <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
     <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
     <input name="framerange" type="string" value="" uniform="true" />
@@ -358,6 +361,7 @@
     <input name="default" type="vector2" value="0.0, 0.0" />
     <input name="position" type="vector3" defaultgeomprop="Pobject" />
     <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+    <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
     <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
     <input name="framerange" type="string" value="" uniform="true" />
@@ -375,6 +379,7 @@
     <input name="default" type="vector3" value="0.0, 0.0, 0.0" />
     <input name="position" type="vector3" defaultgeomprop="Pobject" />
     <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+    <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
     <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
     <input name="framerange" type="string" value="" uniform="true" />
@@ -392,6 +397,7 @@
     <input name="default" type="vector4" value="0.0, 0.0, 0.0, 0.0" />
     <input name="position" type="vector3" defaultgeomprop="Pobject" />
     <input name="normal" type="vector3" defaultgeomprop="Nobject" />
+    <input name="upaxis" type="integer" value="2" enum="X,Y,Z" enumvalues="0,1,2" uniform="true" />
     <input name="blend" type="float" value="1.0" uimin="0.0" uimax="1.0" />
     <input name="filtertype" type="string" value="linear" enum="closest,linear,cubic" uniform="true" />
     <input name="framerange" type="string" value="" uniform="true" />
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index 2c87e17196..0b601d6857 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -226,11 +226,45 @@
       <input name="in1" type="float" nodename="N_extX_float" />
       <input name="in2" type="float" nodename="N_extY_float" />
     </combine2>
+    <multiply name="N_vecXY_invert_float" type="float">
+      <input name="in1" type="float" nodename="N_extY_float" />
+      <input name="in2" type="float" value="-1" />
+    </multiply>
+    <combine2 name="N_vecXY_xUp_float" type="vector2">
+      <input name="in1" type="float" nodename="N_vecXY_invert_float" />
+      <input name="in2" type="float" nodename="N_extX_float" />
+    </combine2>
+    <combine2 name="N_vecXZ_xUp_float" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_float" />
+      <input name="in2" type="float" nodename="N_extX_float" />
+    </combine2>
+    <combine2 name="N_vecYZ_yUp_float" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_float" />
+      <input name="in2" type="float" nodename="N_extY_float" />
+    </combine2>
+    <switch name="N_upDirSwitchXY_float" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXY_xUp_float" />
+      <input name="in2" type="vector2" nodename="N_vecXY_float" />
+      <input name="in3" type="vector2" nodename="N_vecXY_float" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchXZ_float" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXZ_xUp_float" />
+      <input name="in2" type="vector2" nodename="N_vecXZ_float" />
+      <input name="in3" type="vector2" nodename="N_vecXZ_float" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchYZ_float" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecYZ_yUp_float" />
+      <input name="in2" type="vector2" nodename="N_vecYZ_yUp_float" />
+      <input name="in3" type="vector2" nodename="N_vecYZ_float" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
     <image name="N_imgX_float" type="float">
       <input name="file" type="filename" interfacename="filex" />
       <input name="layer" type="string" interfacename="layerx" />
       <input name="default" type="float" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecYZ_float" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchYZ_float" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -242,7 +276,7 @@
       <input name="file" type="filename" interfacename="filey" />
       <input name="layer" type="string" interfacename="layery" />
       <input name="default" type="float" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXZ_float" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXZ_float" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -254,7 +288,7 @@
       <input name="file" type="filename" interfacename="filez" />
       <input name="layer" type="string" interfacename="layerz" />
       <input name="default" type="float" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXY_float" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXY_float" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -346,11 +380,45 @@
       <input name="in1" type="float" nodename="N_extX_color3" />
       <input name="in2" type="float" nodename="N_extY_color3" />
     </combine2>
+    <multiply name="N_vecXY_invert_color3" type="float">
+      <input name="in1" type="float" nodename="N_extY_color3" />
+      <input name="in2" type="float" value="-1" />
+    </multiply>
+    <combine2 name="N_vecXY_xUp_color3" type="vector2">
+      <input name="in1" type="float" nodename="N_vecXY_invert_color3" />
+      <input name="in2" type="float" nodename="N_extX_color3" />
+    </combine2>
+    <combine2 name="N_vecXZ_xUp_color3" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_color3" />
+      <input name="in2" type="float" nodename="N_extX_color3" />
+    </combine2>
+    <combine2 name="N_vecYZ_yUp_color3" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_color3" />
+      <input name="in2" type="float" nodename="N_extY_color3" />
+    </combine2>
+    <switch name="N_upDirSwitchXY_color3" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXY_xUp_color3" />
+      <input name="in2" type="vector2" nodename="N_vecXY_color3" />
+      <input name="in3" type="vector2" nodename="N_vecXY_color3" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchXZ_color3" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXZ_xUp_color3" />
+      <input name="in2" type="vector2" nodename="N_vecXZ_color3" />
+      <input name="in3" type="vector2" nodename="N_vecXZ_color3" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchYZ_color3" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecYZ_yUp_color3" />
+      <input name="in2" type="vector2" nodename="N_vecYZ_yUp_color3" />
+      <input name="in3" type="vector2" nodename="N_vecYZ_color3" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
     <image name="N_imgX_color3" type="color3">
       <input name="file" type="filename" interfacename="filex" />
       <input name="layer" type="string" interfacename="layerx" />
       <input name="default" type="color3" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecYZ_color3" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchYZ_color3" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -362,7 +430,7 @@
       <input name="file" type="filename" interfacename="filey" />
       <input name="layer" type="string" interfacename="layery" />
       <input name="default" type="color3" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXZ_color3" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXZ_color3" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -374,7 +442,7 @@
       <input name="file" type="filename" interfacename="filez" />
       <input name="layer" type="string" interfacename="layerz" />
       <input name="default" type="color3" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXY_color3" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXY_color3" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -466,11 +534,45 @@
       <input name="in1" type="float" nodename="N_extX_color4" />
       <input name="in2" type="float" nodename="N_extY_color4" />
     </combine2>
+    <multiply name="N_vecXY_invert_color4" type="float">
+      <input name="in1" type="float" nodename="N_extY_color4" />
+      <input name="in2" type="float" value="-1" />
+    </multiply>
+    <combine2 name="N_vecXY_xUp_color4" type="vector2">
+      <input name="in1" type="float" nodename="N_vecXY_invert_color4" />
+      <input name="in2" type="float" nodename="N_extX_color4" />
+    </combine2>
+    <combine2 name="N_vecXZ_xUp_color4" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_color4" />
+      <input name="in2" type="float" nodename="N_extX_color4" />
+    </combine2>
+    <combine2 name="N_vecYZ_yUp_color4" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_color4" />
+      <input name="in2" type="float" nodename="N_extY_color4" />
+    </combine2>
+    <switch name="N_upDirSwitchXY_color4" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXY_xUp_color4" />
+      <input name="in2" type="vector2" nodename="N_vecXY_color4" />
+      <input name="in3" type="vector2" nodename="N_vecXY_color4" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchXZ_color4" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXZ_xUp_color4" />
+      <input name="in2" type="vector2" nodename="N_vecXZ_color4" />
+      <input name="in3" type="vector2" nodename="N_vecXZ_color4" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchYZ_color4" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecYZ_yUp_color4" />
+      <input name="in2" type="vector2" nodename="N_vecYZ_yUp_color4" />
+      <input name="in3" type="vector2" nodename="N_vecYZ_color4" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
     <image name="N_imgX_color4" type="color4">
       <input name="file" type="filename" interfacename="filex" />
       <input name="layer" type="string" interfacename="layerx" />
       <input name="default" type="color4" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecYZ_color4" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchYZ_color4" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -482,7 +584,7 @@
       <input name="file" type="filename" interfacename="filey" />
       <input name="layer" type="string" interfacename="layery" />
       <input name="default" type="color4" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXZ_color4" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXZ_color4" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -494,7 +596,7 @@
       <input name="file" type="filename" interfacename="filez" />
       <input name="layer" type="string" interfacename="layerz" />
       <input name="default" type="color4" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXY_color4" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXY_color4" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -586,11 +688,45 @@
       <input name="in1" type="float" nodename="N_extX_vector2" />
       <input name="in2" type="float" nodename="N_extY_vector2" />
     </combine2>
+    <multiply name="N_vecXY_invert_vector2" type="float">
+      <input name="in1" type="float" nodename="N_extY_vector2" />
+      <input name="in2" type="float" value="-1" />
+    </multiply>
+    <combine2 name="N_vecXY_xUp_vector2" type="vector2">
+      <input name="in1" type="float" nodename="N_vecXY_invert_vector2" />
+      <input name="in2" type="float" nodename="N_extX_vector2" />
+    </combine2>
+    <combine2 name="N_vecXZ_xUp_vector2" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_vector2" />
+      <input name="in2" type="float" nodename="N_extX_vector2" />
+    </combine2>
+    <combine2 name="N_vecYZ_yUp_vector2" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_vector2" />
+      <input name="in2" type="float" nodename="N_extY_vector2" />
+    </combine2>
+    <switch name="N_upDirSwitchXY_vector2" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXY_xUp_vector2" />
+      <input name="in2" type="vector2" nodename="N_vecXY_vector2" />
+      <input name="in3" type="vector2" nodename="N_vecXY_vector2" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchXZ_vector2" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXZ_xUp_vector2" />
+      <input name="in2" type="vector2" nodename="N_vecXZ_vector2" />
+      <input name="in3" type="vector2" nodename="N_vecXZ_vector2" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchYZ_vector2" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecYZ_yUp_vector2" />
+      <input name="in2" type="vector2" nodename="N_vecYZ_yUp_vector2" />
+      <input name="in3" type="vector2" nodename="N_vecYZ_vector2" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
     <image name="N_imgX_vector2" type="vector2">
       <input name="file" type="filename" interfacename="filex" />
       <input name="layer" type="string" interfacename="layerx" />
       <input name="default" type="vector2" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecYZ_vector2" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchYZ_vector2" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -602,7 +738,7 @@
       <input name="file" type="filename" interfacename="filey" />
       <input name="layer" type="string" interfacename="layery" />
       <input name="default" type="vector2" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXZ_vector2" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXZ_vector2" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -614,7 +750,7 @@
       <input name="file" type="filename" interfacename="filez" />
       <input name="layer" type="string" interfacename="layerz" />
       <input name="default" type="vector2" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXY_vector2" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXY_vector2" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -706,11 +842,45 @@
       <input name="in1" type="float" nodename="N_extX_vector3" />
       <input name="in2" type="float" nodename="N_extY_vector3" />
     </combine2>
+    <multiply name="N_vecXY_invert_vector3" type="float">
+      <input name="in1" type="float" nodename="N_extY_vector3" />
+      <input name="in2" type="float" value="-1" />
+    </multiply>
+    <combine2 name="N_vecXY_xUp_vector3" type="vector2">
+      <input name="in1" type="float" nodename="N_vecXY_invert_vector3" />
+      <input name="in2" type="float" nodename="N_extX_vector3" />
+    </combine2>
+    <combine2 name="N_vecXZ_xUp_vector3" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_vector3" />
+      <input name="in2" type="float" nodename="N_extX_vector3" />
+    </combine2>
+    <combine2 name="N_vecYZ_yUp_vector3" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_vector3" />
+      <input name="in2" type="float" nodename="N_extY_vector3" />
+    </combine2>
+    <switch name="N_upDirSwitchXY_vector3" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXY_xUp_vector3" />
+      <input name="in2" type="vector2" nodename="N_vecXY_vector3" />
+      <input name="in3" type="vector2" nodename="N_vecXY_vector3" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchXZ_vector3" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXZ_xUp_vector3" />
+      <input name="in2" type="vector2" nodename="N_vecXZ_vector3" />
+      <input name="in3" type="vector2" nodename="N_vecXZ_vector3" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchYZ_vector3" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecYZ_yUp_vector3" />
+      <input name="in2" type="vector2" nodename="N_vecYZ_yUp_vector3" />
+      <input name="in3" type="vector2" nodename="N_vecYZ_vector3" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
     <image name="N_imgX_vector3" type="vector3">
       <input name="file" type="filename" interfacename="filex" />
       <input name="layer" type="string" interfacename="layerx" />
       <input name="default" type="vector3" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecYZ_vector3" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchYZ_vector3" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -722,7 +892,7 @@
       <input name="file" type="filename" interfacename="filey" />
       <input name="layer" type="string" interfacename="layery" />
       <input name="default" type="vector3" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXZ_vector3" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXZ_vector3" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -734,7 +904,7 @@
       <input name="file" type="filename" interfacename="filez" />
       <input name="layer" type="string" interfacename="layerz" />
       <input name="default" type="vector3" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXY_vector3" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXY_vector3" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -826,11 +996,45 @@
       <input name="in1" type="float" nodename="N_extX_vector4" />
       <input name="in2" type="float" nodename="N_extY_vector4" />
     </combine2>
+    <multiply name="N_vecXY_invert_vector4" type="float">
+      <input name="in1" type="float" nodename="N_extY_vector4" />
+      <input name="in2" type="float" value="-1" />
+    </multiply>
+    <combine2 name="N_vecXY_xUp_vector4" type="vector2">
+      <input name="in1" type="float" nodename="N_vecXY_invert_vector4" />
+      <input name="in2" type="float" nodename="N_extX_vector4" />
+    </combine2>
+    <combine2 name="N_vecXZ_xUp_vector4" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_vector4" />
+      <input name="in2" type="float" nodename="N_extX_vector4" />
+    </combine2>
+    <combine2 name="N_vecYZ_yUp_vector4" type="vector2">
+      <input name="in1" type="float" nodename="N_extZ_vector4" />
+      <input name="in2" type="float" nodename="N_extY_vector4" />
+    </combine2>
+    <switch name="N_upDirSwitchXY_vector4" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXY_xUp_vector4" />
+      <input name="in2" type="vector2" nodename="N_vecXY_vector4" />
+      <input name="in3" type="vector2" nodename="N_vecXY_vector4" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchXZ_vector4" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecXZ_xUp_vector4" />
+      <input name="in2" type="vector2" nodename="N_vecXZ_vector4" />
+      <input name="in3" type="vector2" nodename="N_vecXZ_vector4" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
+    <switch name="N_upDirSwitchYZ_vector4" type="vector2">
+      <input name="in1" type="vector2" nodename="N_vecYZ_yUp_vector4" />
+      <input name="in2" type="vector2" nodename="N_vecYZ_yUp_vector4" />
+      <input name="in3" type="vector2" nodename="N_vecYZ_vector4" />
+      <input name="which" type="integer" interfacename="upaxis" />
+    </switch>
     <image name="N_imgX_vector4" type="vector4">
       <input name="file" type="filename" interfacename="filex" />
       <input name="layer" type="string" interfacename="layerx" />
       <input name="default" type="vector4" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecYZ_vector4" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchYZ_vector4" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -842,7 +1046,7 @@
       <input name="file" type="filename" interfacename="filey" />
       <input name="layer" type="string" interfacename="layery" />
       <input name="default" type="vector4" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXZ_vector4" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXZ_vector4" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />
@@ -854,7 +1058,7 @@
       <input name="file" type="filename" interfacename="filez" />
       <input name="layer" type="string" interfacename="layerz" />
       <input name="default" type="vector4" interfacename="default" />
-      <input name="texcoord" type="vector2" nodename="N_vecXY_vector4" />
+      <input name="texcoord" type="vector2" nodename="N_upDirSwitchXY_vector4" />
       <input name="uaddressmode" type="string" value="periodic" />
       <input name="vaddressmode" type="string" value="periodic" />
       <input name="filtertype" type="string" interfacename="filtertype" />