[Bf-blender-cvs] [15d1b8f35df] tmp-usd-mak-c87f6242: Fixed USD 21.11 compiler errors.

[Michael Kowalski]

Commit: 15d1b8f35df47bc71bb9fc8bb917269945e3e270
Author: Michael Kowalski
Date:   Sun May 1 23:27:55 2022 -0400
Branches: tmp-usd-mak-c87f6242
https://developer.blender.org/rB15d1b8f35df47bc71bb9fc8bb917269945e3e270

Fixed USD 21.11 compiler errors.

===================================================================

M	source/blender/io/usd/intern/usd_writer_light.cc
M	source/blender/io/usd/intern/usd_writer_material.cc

===================================================================

diff --git a/source/blender/io/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc
index f0fd96791d3..7897c7362de 100644
--- a/source/blender/io/usd/intern/usd_writer_light.cc
+++ b/source/blender/io/usd/intern/usd_writer_light.cc
@@ -223,7 +223,7 @@ void USDLightWriter::do_write(HierarchyContext &context)
       }
 
 #if PXR_VERSION >= 2111
-      usd_light_api = distant_light.LightAPI();
+      usd_light_api = sun_light.LightAPI();
 #else
       usd_light_api = sun_light;
 #endif
diff --git a/source/blender/io/usd/intern/usd_writer_material.cc b/source/blender/io/usd/intern/usd_writer_material.cc
index 1878017b3db..15e2a7f721c 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -33,6 +33,8 @@
 #include <pxr/pxr.h>
 #include <pxr/usd/usdGeom/scope.h>
 
+#include <pxr/usd/usdShade/connectableAPI.h>
+
 #include <cctype>
 #include <iostream>
 
@@ -1887,7 +1889,7 @@ static void link_cycles_nodes(pxr::UsdStageRefPtr a_stage,
     if (to_sock == nullptr)
       continue;
 
-    pxr::UsdShadeShader from_shader = pxr::UsdShadeShader::Define(
+    pxr::UsdShadeConnectableAPI from_shader = pxr::UsdShadeShader::Define(
         a_stage,
         shader_path.AppendChild(pxr::TfToken(pxr::TfMakeValidIdentifier(from_node->name))));