[Bf-blender-cvs] [7e2f21a04fa] usd-importer-T81257-merge: USD import: fixed deprecated function warning.

makowalski noreply at git.blender.org
Thu Apr 15 01:58:14 CEST 2021


Commit: 7e2f21a04fa8cbaf36ca6d275c0d2bcd25c67a54
Author: makowalski
Date:   Wed Apr 14 17:10:48 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB7e2f21a04fa8cbaf36ca6d275c0d2bcd25c67a54

USD import: fixed deprecated function warning.

Replaced call to deprecated UsdShadeConnectableAPI::IsShader()
to fix warning.

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

M	source/blender/io/usd/intern/usd_reader_material.cc

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

diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc
index cf0ccb3ff23..b0090392884 100644
--- a/source/blender/io/usd/intern/usd_reader_material.cc
+++ b/source/blender/io/usd/intern/usd_reader_material.cc
@@ -114,7 +114,7 @@ static void link_nodes(
 static pxr::UsdShadeShader get_source_shader(const pxr::UsdShadeConnectableAPI &source,
                                              pxr::TfToken in_shader_id)
 {
-  if (source && source.IsShader()) {
+  if (source && source.GetPrim().IsA<pxr::UsdShadeShader>()) {
     pxr::UsdShadeShader source_shader(source.GetPrim());
     if (source_shader) {
       pxr::TfToken shader_id;
@@ -378,7 +378,7 @@ void USDMaterialReader::set_node_input(const pxr::UsdShadeInput &usd_input,
 
     usd_input.GetConnectedSource(&source, &source_name, &source_type);
 
-    if (!(source && source.IsShader())) {
+    if (!(source && source.GetPrim().IsA<pxr::UsdShadeShader>())) {
       return;
     }



More information about the Bf-blender-cvs mailing list