[Bf-blender-cvs] [e517cc0a06e] soc-2020-io-performance: Use short for tot_col: total materials in an object.

[Ankit Meel]

Commit: e517cc0a06e901c43ac9ca77490bb059a41f3e31
Author: Ankit Meel
Date:   Mon Jul 6 15:56:13 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBe517cc0a06e901c43ac9ca77490bb059a41f3e31

Use short for tot_col: total materials in an object.

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
index 19a3970241b..aebbe195178 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
@@ -174,9 +174,9 @@ const uint OBJMesh::tot_edges()
 /**
  * Total materials in the object to export.
  */
-const uint OBJMesh::tot_col()
+const short OBJMesh::tot_col()
 {
-  return (uint)export_mesh_eval_->totcol;
+  return export_mesh_eval_->totcol;
 }
 
 /**
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
index 2dcfc575831..f5c426ad703 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
@@ -85,7 +85,7 @@ class OBJMesh : NonMovable, NonCopyable {
   const uint tot_polygons();
   const uint tot_uv_vertices();
   const uint tot_edges();
-  const uint tot_col();
+  const short tot_col();
   const uint tot_smooth_groups();
 
   void ensure_mesh_normals();