Commit: 5bddc84c86e61efc879bf859e9ca661447dc2b10
Author: Michael Kowalski
Date: Sun May 1 23:44:18 2022 -0400
Branches: tmp-usd-mak-c87f6242
https://developer.blender.org/rB5bddc84c86e61efc879bf859e9ca661447dc2b10
Fix compiler errors.
===================================================================
M source/blender/io/usd/intern/usd_writer_material.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_writer_material.cc
b/source/blender/io/usd/intern/usd_writer_material.cc
index 15e2a7f721c..96d65bb397e 100644
--- a/source/blender/io/usd/intern/usd_writer_material.cc
+++ b/source/blender/io/usd/intern/usd_writer_material.cc
@@ -1889,7 +1889,7 @@ static void link_cycles_nodes(pxr::UsdStageRefPtr a_stage,
if (to_sock == nullptr)
continue;
- pxr::UsdShadeConnectableAPI from_shader = pxr::UsdShadeShader::Define(
+ pxr::UsdShadeShader from_shader = pxr::UsdShadeShader::Define(
a_stage,
shader_path.AppendChild(pxr::TfToken(pxr::TfMakeValidIdentifier(from_node->name))));
@@ -1897,17 +1897,17 @@ static void link_cycles_nodes(pxr::UsdStageRefPtr
a_stage,
if (strncmp(to_sock->name, "Surface", 64) == 0) {
if (strncmp(from_sock->name, "BSDF", 64) == 0)
usd_material.CreateSurfaceOutput(cyclestokens::cycles)
- .ConnectToSource(from_shader, cyclestokens::bsdf);
+ .ConnectToSource(from_shader.ConnectableAPI(),
cyclestokens::bsdf);
else
usd_material.CreateSurfaceOutput(cyclestokens::cycles)
- .ConnectToSource(from_shader, cyclestokens::closure);
+ .ConnectToSource(from_shader.ConnectableAPI(),
cyclestokens::closure);
}
else if (strncmp(to_sock->name, "Volume", 64) == 0)
usd_material.CreateVolumeOutput(cyclestokens::cycles)
- .ConnectToSource(from_shader, cyclestokens::bsdf);
+ .ConnectToSource(from_shader.ConnectableAPI(), cyclestokens::bsdf);
else if (strncmp(to_sock->name, "Displacement", 64) == 0)
usd_material.CreateDisplacementOutput(cyclestokens::cycles)
- .ConnectToSource(from_shader, cyclestokens::vector);
+ .ConnectToSource(from_shader.ConnectableAPI(),
cyclestokens::vector);
continue;
}
@@ -1974,7 +1974,8 @@ static void link_cycles_nodes(pxr::UsdStageRefPtr a_stage,
to_shader
.CreateInput(pxr::TfToken(pxr::TfMakeValidIdentifier(toName)),
pxr::SdfValueTypeNames->Float)
- .ConnectToSource(from_shader,
pxr::TfToken(pxr::TfMakeValidIdentifier(fromName)));
+ .ConnectToSource(from_shader.ConnectableAPI(),
+ pxr::TfToken(pxr::TfMakeValidIdentifier(fromName)));
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
