[Bf-blender-cvs] [fc816d358eb] soc-2020-io-performance: Fix build error after merge; add logging.

[Ankit Meel]

Commit: fc816d358eb88a607828a6066ce33f996b4b5d46
Author: Ankit Meel
Date:   Fri Aug 28 17:39:06 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBfc816d358eb88a607828a6066ce33f996b4b5d46

Fix build error after merge; add logging.

Fix typo in the {rB0aeb338d1952725cfb8}: really turn off tessellation
this time.

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index a720d68f437..8c0bd6336a8 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -203,7 +203,7 @@ void exporter_main(bContext *C, const OBJExportParams &export_params)
     }
 
     CFRA = frame;
-    BKE_scene_graph_update_for_newframe(depsgraph, bmain);
+    BKE_scene_graph_update_for_newframe(depsgraph);
     fprintf(stderr, "Writing to %s\n", filepath_with_frames);
     export_frame(view_layer, depsgraph, export_params, filepath_with_frames);
   }
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 468573b274d..27893e308b4 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
@@ -264,9 +264,10 @@ OBJParser::OBJParser(const OBJImportParams &import_params) : import_params_(impo
 {
   obj_file_.open(import_params_.filepath);
   if (!obj_file_.good()) {
-    fprintf(stderr, "Cannot read from OBJ file:%s.\n", import_params_.filepath);
+    fprintf(stderr, "Cannot read from OBJ file:'%s'.\n", import_params_.filepath);
     return;
   }
+  fprintf(stderr, "Reading OBJ file from '%s'\n", import_params.filepath);
 }
 
 /**
@@ -531,8 +532,9 @@ MTLParser::MTLParser(StringRef mtl_library, StringRefNull obj_filepath)
   BLI_split_dir_part(mtl_file_path_, mtl_dir_path_, FILE_MAXDIR);
   mtl_file_.open(mtl_file_path_);
   if (!mtl_file_.good()) {
-    fprintf(stderr, "Cannot read from MTL file:%s\n", mtl_file_path_);
+    fprintf(stderr, "Cannot read from MTL file:'%s'\n", mtl_file_path_);
   }
+  fprintf(stderr, "Reading MTL file from:'%s'\n", mtl_file_path_);
 }
 
 /**
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
index 6867cc302f2..f540661eca7 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
@@ -114,7 +114,7 @@ std::pair<int64_t, int64_t> MeshFromGeometry::tessellate_polygons(
   int64_t removed_faces = 0;
   int64_t removed_loops = 0;
   for (const FaceElement &curr_face : mesh_geometry_.face_elements()) {
-    if (curr_face.shaded_smooth && true) {  // should be valid/invalid
+    if (curr_face.shaded_smooth || true) {  // should be valid/invalid
       return {removed_faces, removed_loops};
     }
     Vector<int> face_vert_indices;