source/blender/nodes/shader/materialx/nodes/bsdf_principled.cc

@@ -72,8 +72,12 @@ NodeItem BSDFPrincipledNodeParser::compute()
   res.set_input("base", 1.0, "float");
   res.set_input("base_color", base_color.to_color3());
   res.set_input("diffuse_roughness", roughness);
-  res.set_input("normal", normal);
-  res.set_input("tangent", tangent);
+  if (normal) {
+    res.set_input("normal", normal);
+  }
+  if (tangent) {
+    res.set_input("tangent", tangent);
+  }
 
   if (metallic != zero) {
     res.set_input("metalness", metallic);
@@ -84,8 +88,10 @@ NodeItem BSDFPrincipledNodeParser::compute()
     res.set_input("specular_color", base_color.to_color3());
     res.set_input("specular_roughness", roughness);
     res.set_input("specular_IOR", ior);
-    res.set_input("specular_anisotropy", anisotropic);
-    res.set_input("specular_rotation", anisotropic_rotation);
+    if (anisotropic) {
+      res.set_input("specular_anisotropy", anisotropic);
+      res.set_input("specular_rotation", anisotropic_rotation);
+    }
   }
 
   if (transmission != zero) {
@@ -98,7 +104,9 @@ NodeItem BSDFPrincipledNodeParser::compute()
     res.set_input("subsurface", subsurface);
     res.set_input("subsurface_color", subsurface_color);
     res.set_input("subsurface_radius", subsurface_radius);
-    res.set_input("subsurface_anisotropy", anisotropic);
+    if (anisotropic) {
+      res.set_input("subsurface_anisotropy", anisotropic);
+    }
   }
 
   if (sheen != zero) {
@@ -112,8 +120,10 @@ NodeItem BSDFPrincipledNodeParser::compute()
     res.set_input("coat_color", base_color.to_color3());
     res.set_input("coat_roughness", clearcoat_roughness);
     res.set_input("coat_IOR", ior);
-    res.set_input("coat_anisotropy", anisotropic);
-    res.set_input("coat_rotation", anisotropic_rotation);
+    if (anisotropic) {
+      res.set_input("coat_anisotropy", anisotropic);
+      res.set_input("coat_rotation", anisotropic_rotation);
+    }
     res.set_input("coat_normal", clearcoat_normal);
   }
 

source/blender/nodes/shader/materialx/nodes/node_item.cc

@@ -25,6 +25,9 @@ void NodeItem::set_input(const std::string &name, const NodeItem &item)
   else if (item.node) {
     set_input(name, item.node);
   }
+  else {
+    CLOG_WARN(LOG_MATERIALX_SHADER, "Empty item to input: %s", name.c_str());
+  }
 }
 
 void NodeItem::set_input(const std::string &name, const MaterialX::ValuePtr value)
@@ -232,10 +235,6 @@ NodeItem NodeItem::if_else(const std::string &condition,
 
   NodeItem res = empty();
   if (type() != "float" || other.type() != "float") {
-    CLOG_WARN(LOG_MATERIALX_SHADER,
-              "Incorrect condition types: %s, %s",
-              type().c_str(),
-              other.type().c_str());
     return res;
   }
 
@@ -365,27 +364,27 @@ NodeItem NodeItem::exp() const
 
 NodeItem NodeItem::to_color3() const
 {
-  std::string t = type();
+  std::string mx_type = type();
   NodeItem res = empty();
   if (value) {
     MaterialX::Color3 c;
-    if (t == "float") {
+    if (mx_type == "float") {
       float v = value->asA<float>();
       c = {v, v, v};
     }
-    else if (t == "color3") {
+    else if (mx_type == "color3") {
       auto v = value->asA<MaterialX::Color3>();
       c = {v[0], v[1], v[2]};
     }
-    else if (t == "color4") {
+    else if (mx_type == "color4") {
       auto v = value->asA<MaterialX::Color4>();
       c = {v[0], v[1], v[2]};
     }
-    else if (t == "vector3") {
+    else if (mx_type == "vector3") {
       auto v = value->asA<MaterialX::Vector3>();
       c = {v[0], v[1], v[2]};
     }
-    else if (t == "vector4") {
+    else if (mx_type == "vector4") {
       auto v = value->asA<MaterialX::Vector4>();
       c = {v[0], v[1], v[2]};
     }
@@ -395,7 +394,7 @@ NodeItem NodeItem::to_color3() const
     res.value = MaterialX::Value::createValue<MaterialX::Color3>(c);
   }
   else if (node) {
-    if (t != "color3") {
+    if (mx_type != "color3") {
       return res;
     }
     res.node = node;