[Bf-blender-cvs] [d5866e8d74a] soc-2020-io-performance: Cleanup: renaming & comments.

[Ankit Meel]

Commit: d5866e8d74a077131e32ca75286fc3cb705322ff
Author: Ankit Meel
Date:   Thu Aug 13 18:07:58 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBd5866e8d74a077131e32ca75286fc3cb705322ff

Cleanup: renaming & comments.

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.cc

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
index 7d0b4cd65ac..d7152412ed5 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
@@ -257,7 +257,7 @@ void OBJParser::parse_and_store(Vector<std::unique_ptr<Geometry>> &all_geometrie
                                 GlobalVertices &global_vertices)
 {
   if (!obj_file_.good()) {
-    fprintf(stderr, "Cannot read from file:%s.\n", import_params_.filepath);
+    fprintf(stderr, "Cannot read from OBJ file:%s.\n", import_params_.filepath);
     return;
   }
 
@@ -467,7 +467,7 @@ MTLParser::MTLParser(StringRef mtl_library, StringRefNull obj_filepath)
 void MTLParser::parse_and_store(Map<string, MTLMaterial> &mtl_materials)
 {
   if (!mtl_file_.good()) {
-    fprintf(stderr, "Cannot read from file:%s\n", mtl_file_path_);
+    fprintf(stderr, "Cannot read from MTL file:%s\n", mtl_file_path_);
   }
 
   string line;
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.cc
index 5aac94fe11d..f2594a14ff6 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.cc
@@ -217,14 +217,14 @@ void ShaderNodetreeWrap::add_image_textures(Main *bmain)
       /* No Image texture node of this map type to add in this material. */
       continue;
     }
-    unique_node_ptr tex_node{add_node_to_tree(SH_NODE_TEX_IMAGE)};
-    unique_node_ptr vector_node{add_node_to_tree(SH_NODE_MAPPING)};
-    unique_node_ptr normal_map_node = nullptr;
+    unique_node_ptr image_texture{add_node_to_tree(SH_NODE_TEX_IMAGE)};
+    unique_node_ptr mapping{add_node_to_tree(SH_NODE_MAPPING)};
     unique_node_ptr texture_coordinate(add_node_to_tree(SH_NODE_TEX_COORD));
+    unique_node_ptr normal_map = nullptr;
     if (texture_map.key == "map_Bump") {
-      normal_map_node.reset(add_node_to_tree(SH_NODE_NORMAL_MAP));
+      normal_map.reset(add_node_to_tree(SH_NODE_NORMAL_MAP));
       set_property_of_socket(
-          SOCK_FLOAT, "Strength", {mtl_mat_->map_Bump_strength}, normal_map_node.get());
+          SOCK_FLOAT, "Strength", {mtl_mat_->map_Bump_strength}, normal_map.get());
     }
 
     if (!set_img_filepath(bmain, texture_map.value, image_texture.get())) {
@@ -232,17 +232,18 @@ void ShaderNodetreeWrap::add_image_textures(Main *bmain)
       continue;
     }
     set_property_of_socket(
-        SOCK_VECTOR, "Location", {texture_map.value.translation, 3}, vector_node.get());
-    set_property_of_socket(SOCK_VECTOR, "Scale", {texture_map.value.scale, 3}, vector_node.get());
+        SOCK_VECTOR, "Location", {texture_map.value.translation, 3}, mapping.get());
+    set_property_of_socket(SOCK_VECTOR, "Scale", {texture_map.value.scale, 3}, mapping.get());
 
-    link_sockets(std::move(vector_node), "Vector", tex_node.get(), "Vector");
-    if (normal_map_node) {
-      link_sockets(std::move(tex_node), "Color", normal_map_node.get(), "Color");
-      link_sockets(std::move(normal_map_node), "Normal", bsdf_.get(), "Normal");
     link_sockets(std::move(texture_coordinate), "UV", mapping.get(), "Vector");
+    link_sockets(std::move(mapping), "Vector", image_texture.get(), "Vector");
+    if (normal_map) {
+      link_sockets(std::move(image_texture), "Color", normal_map.get(), "Color");
+      link_sockets(std::move(normal_map), "Normal", bsdf_.get(), "Normal");
     }
     else {
-      link_sockets(std::move(tex_node), "Color", bsdf_.get(), texture_map.value.dest_socket_id);
+      link_sockets(
+          std::move(image_texture), "Color", bsdf_.get(), texture_map.value.dest_socket_id);
     }
   }
 }