[Bf-blender-cvs] [151e8825122] soc-2020-io-performance: Exporter: Fix UV indices being edited by the writer.

[Ankit Meel]

Commit: 151e882512298cd805f4623c19470096521e135f
Author: Ankit Meel
Date:   Thu Jul 16 21:08:07 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB151e882512298cd805f4623c19470096521e135f

Exporter: Fix UV indices being edited by the writer.

Also revert
{{rBd68899e99a0c}}

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
index 2f83870f0a3..0d9c9fbc8aa 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
@@ -60,7 +60,7 @@ void OBJWriter::write_vert_normal_indices(Span<uint> vert_indices,
   fprintf(outfile_, "f");
   for (uint j = 0; j < poly_to_write.totloop; j++) {
     fprintf(outfile_,
-            " %u//%u ",
+            " %u//%u",
             vert_indices[j] + index_offset_[VERTEX_OFF],
             normal_indices[j] + index_offset_[NORMAL_OFF]);
   }
@@ -79,7 +79,7 @@ void OBJWriter::write_vert_uv_indices(Span<uint> vert_indices,
     fprintf(outfile_,
             " %u/%u",
             vert_indices[j] + index_offset_[VERTEX_OFF],
-            uv_indices[j] + 1 + index_offset_[UV_VERTEX_OFF]);
+            uv_indices[j] + index_offset_[UV_VERTEX_OFF]);
   }
   fprintf(outfile_, "\n");
 }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
index 29e6b8d441e..82d5a2d0bff 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
@@ -333,7 +333,7 @@ void OBJMesh::store_uv_coords_and_indices(Vector<std::array<float, 2>> &r_uv_coo
       r_uv_coords[tot_uv_vertices_ - 1][1] = vert_uv_coords[1];
 
       r_uv_indices[uv_vert->poly_index].resize(vertices_in_poly);
-      r_uv_indices[uv_vert->poly_index][uv_vert->loop_of_poly_index] = tot_uv_vertices_ - 1;
+      r_uv_indices[uv_vert->poly_index][uv_vert->loop_of_poly_index] = tot_uv_vertices_;
     }
   }
   BKE_mesh_uv_vert_map_free(uv_vert_map);