[Bf-blender-cvs] [fa8957e0599] refactor-mesh-material-index-generic: Fix face materials match PBVH check

[Hans Goudey]

Commit: fa8957e0599cf2be06c4822d9a5c0231320d2077
Author: Hans Goudey
Date:   Mon Aug 29 15:11:44 2022 -0500
Branches: refactor-mesh-material-index-generic
https://developer.blender.org/rBfa8957e0599cf2be06c4822d9a5c0231320d2077

Fix face materials match PBVH check

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

M	source/blender/blenkernel/intern/pbvh.c

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

diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 227fd288758..e2e8dedbd06 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -148,7 +148,9 @@ static void update_node_vb(PBVH *pbvh, PBVHNode *node)
 static bool face_materials_match(const PBVH *pbvh, const int a, const int b)
 {
   if (pbvh->material_indices) {
-    return pbvh->material_indices[a] == pbvh->material_indices[b];
+    if (pbvh->material_indices[a] != pbvh->material_indices[b]) {
+      return false;
+    }
   }
   return (pbvh->mpoly[a].flag & ME_SMOOTH) == (pbvh->mpoly[b].flag & ME_SMOOTH);
 }