[Bf-blender-cvs] [6c44cc69a5c] refactor-mesh-remove-pointers: Fix build error

[Hans Goudey]

Commit: 6c44cc69a5c6d23963189d43137cea8bb9ffd66a
Author: Hans Goudey
Date:   Tue Aug 30 13:22:24 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rB6c44cc69a5c6d23963189d43137cea8bb9ffd66a

Fix build error

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

M	source/blender/blenkernel/intern/paint.cc
M	source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc

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

diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc
index 01273f4f384..7c31048b331 100644
--- a/source/blender/blenkernel/intern/paint.cc
+++ b/source/blender/blenkernel/intern/paint.cc
@@ -1624,7 +1624,7 @@ static void sculpt_update_object(Depsgraph *depsgraph,
   Scene *scene = DEG_get_input_scene(depsgraph);
   Sculpt *sd = scene->toolsettings->sculpt;
   SculptSession *ss = ob->sculpt;
-  const Mesh *me = BKE_object_get_original_mesh(ob);
+  Mesh *me = BKE_object_get_original_mesh(ob);
   Mesh *me_eval = BKE_object_get_evaluated_mesh(ob_eval);
   MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob);
   const bool use_face_sets = (ob->mode & OB_MODE_SCULPT) != 0;
@@ -1748,7 +1748,10 @@ static void sculpt_update_object(Depsgraph *depsgraph,
       /* If the fully evaluated mesh has the same topology as the deform-only version, use it.
        * This matters because 'deform eval' is very restrictive and excludes even modifiers that
        * simply recompute vertex weights. */
-      if (me_eval_deform->mpoly == me_eval->mpoly && me_eval_deform->mloop == me_eval->mloop &&
+      if (blender::bke::mesh_polygons(*me_eval_deform).data() ==
+              blender::bke::mesh_polygons(*me_eval).data() &&
+          blender::bke::mesh_loops(*me_eval_deform).data() ==
+              blender::bke::mesh_loops(*me_eval).data() &&
           me_eval_deform->totvert == me_eval->totvert) {
         me_eval_deform = me_eval;
       }
diff --git a/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc
index 2178b9283fb..5c31b597e01 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_flip_faces.cc
@@ -30,7 +30,6 @@ static void mesh_flip_faces(Mesh &mesh, const Field<bool> &selection_field)
   evaluator.evaluate();
   const IndexMask selection = evaluator.get_evaluated_as_mask(0);
 
-  Mesh &mesh = *component.get_for_write();
   const Span<MPoly> polys = bke::mesh_polygons(mesh);
   MutableSpan<MLoop> loops = bke::mesh_loops_for_write(mesh);