Merge branch 'AcademySoftwareFoundation:main' into fix_dot_crash

Author: kwokcb

resources/Materials/TestSuite/stdlib/definition/definition_reduced_interface.mtlx

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<materialx version="1.39" colorspace="lin_rec709" fileprefix="../../../Images/">
+<materialx version="1.39" colorspace="lin_rec709">
 
   <!-- 
     Test file for reduced interface:
@@ -35,7 +35,7 @@
       <input name="scale" type="float" value="3" />
     </normalmap>
     <tiledimage name="pattern_tiledimage" type="vector3">
-      <input name="file" type="filename" uniform="true" value="mesh_wire_norm.png" />
+      <input name="file" type="filename" uniform="true" value="resources/Images/mesh_wire_norm.png" />
       <input name="default" type="vector3" value="0.5, 0.5, 1" />
       <input name="uvtiling" type="vector2" value="10, 10" />
     </tiledimage>

source/MaterialXGenGlsl/Nodes/LightCompoundNodeGlsl.cpp

@@ -73,7 +73,7 @@ void LightCompoundNodeGlsl::emitFunctionDefinition(const ShaderNode& /*node*/, G
         // closure/shader nodes and need to be emitted first.
         shadergen.emitFunctionCalls(*_rootGraph, context, stage, ShaderNode::Classification::TEXTURE);
 
-        shadergen.emitLine("ClosureData closureData = ClosureData(CLOSURE_TYPE_EMISSION, float3(0), -L, light.direction, float3(0), 0)", stage);
+        shadergen.emitLine("ClosureData closureData = ClosureData(CLOSURE_TYPE_EMISSION, vec3(0), -L, light.direction, vec3(0), 0)", stage);
         shadergen.emitFunctionCalls(*_rootGraph, context, stage, ShaderNode::Classification::SHADER | ShaderNode::Classification::LIGHT);
 
         shadergen.emitFunctionBodyEnd(*_rootGraph, context, stage);