[Bf-blender-cvs] [d83dd2c8092] usd-importer-T81257: USD material importer comments.

[makowalski]

Commit: d83dd2c809275e9c92d2e76de24ef1932fdf39ef
Author: makowalski
Date:   Thu Feb 18 15:20:32 2021 -0500
Branches: usd-importer-T81257
https://developer.blender.org/rBd83dd2c809275e9c92d2e76de24ef1932fdf39ef

USD material importer comments.

Also updated to more descriptive function name.

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

M	source/blender/io/usd/import/usd_material_importer.cc
M	source/blender/io/usd/import/usd_material_importer.h

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

diff --git a/source/blender/io/usd/import/usd_material_importer.cc b/source/blender/io/usd/import/usd_material_importer.cc
index f4a4b22f2ef..d9623a7ec09 100644
--- a/source/blender/io/usd/import/usd_material_importer.cc
+++ b/source/blender/io/usd/import/usd_material_importer.cc
@@ -347,7 +347,7 @@ void USDMaterialImporter::set_node_input(const pxr::UsdShadeInput &usd_input,
       }
     }
     else if (shader_id == usdtokens::UsdPrimvarReader_float2) {
-      convert_usd_primvar_reader(
+      convert_usd_primvar_reader_float2(
           source_shader, source_name, dest_node, dest_socket_name, ntree, column + 1, r_ctx);
     }
   }
@@ -473,13 +473,17 @@ void USDMaterialImporter::convert_usd_uv_texture(const pxr::UsdShadeShader &usd_
   }
 }
 
-void USDMaterialImporter::convert_usd_primvar_reader(const pxr::UsdShadeShader &usd_shader,
-                                                     const pxr::TfToken &usd_source_name,
-                                                     bNode *dest_node,
-                                                     const char *dest_socket_name,
-                                                     bNodeTree *ntree,
-                                                     int column,
-                                                     NodePlacementContext &r_ctx) const
+/* This function creates a Blender UV Map node, under the simplifying assumption that
+ * UsdPrimvarReader_float2 shaders output UV coordinates.
+ * TODO(makowalski): investigate supporting conversion to other Blender node types
+ * (e.g., Attribute Nodes) if needed. */
+void USDMaterialImporter::convert_usd_primvar_reader_float2(const pxr::UsdShadeShader &usd_shader,
+                                                            const pxr::TfToken &usd_source_name,
+                                                            bNode *dest_node,
+                                                            const char *dest_socket_name,
+                                                            bNodeTree *ntree,
+                                                            int column,
+                                                            NodePlacementContext &r_ctx) const
 {
   if (!usd_shader || !dest_node || !ntree || !dest_socket_name || !bmain_) {
     return;
diff --git a/source/blender/io/usd/import/usd_material_importer.h b/source/blender/io/usd/import/usd_material_importer.h
index 06bbae9889b..5013deffec4 100644
--- a/source/blender/io/usd/import/usd_material_importer.h
+++ b/source/blender/io/usd/import/usd_material_importer.h
@@ -80,13 +80,13 @@ class USDMaterialImporter {
                               int column,
                               NodePlacementContext &r_ctx) const;
 
-  void convert_usd_primvar_reader(const pxr::UsdShadeShader &usd_shader,
-                                  const pxr::TfToken &usd_source_name,
-                                  bNode *dest_node,
-                                  const char *dest_socket_name,
-                                  bNodeTree *ntree,
-                                  int column,
-                                  NodePlacementContext &r_ctx) const;
+  void convert_usd_primvar_reader_float2(const pxr::UsdShadeShader &usd_shader,
+                                         const pxr::TfToken &usd_source_name,
+                                         bNode *dest_node,
+                                         const char *dest_socket_name,
+                                         bNodeTree *ntree,
+                                         int column,
+                                         NodePlacementContext &r_ctx) const;
 };
 
 }  // namespace blender::io::usd