[Bf-blender-cvs] [8c072cdc935] master: Obj: try to fix Linux tests

[Aras Pranckevicius]

Commit: 8c072cdc935c6cd6ccb7babd48df3809577c6e71
Author: Aras Pranckevicius
Date:   Tue Mar 22 06:37:55 2022 +0200
Branches: master
https://developer.blender.org/rB8c072cdc935c6cd6ccb7babd48df3809577c6e71

Obj: try to fix Linux tests

Related to previous D14368 bug fix, the sorting
operator was not necessarily a stable order sort.

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

M	source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc

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

diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
index a7508f01b0f..e92f70472d0 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -207,7 +207,10 @@ void OBJMesh::calc_poly_order()
   blender::parallel_sort(poly_order_.begin(), poly_order_.end(), [&](int a, int b) {
     int mat_a = mpolys[a].mat_nr;
     int mat_b = mpolys[b].mat_nr;
-    return mat_a < mat_b;
+    if (mat_a != mat_b) {
+      return mat_a < mat_b;
+    }
+    return a < b;
   });
 }