[Bf-blender-cvs] [fd2c9668b50] refactor-mesh-remove-pointers: Fix, cleanups, build errors

[Hans Goudey]

Commit: fd2c9668b504958651e89b7783a7fcae8e76cda6
Author: Hans Goudey
Date:   Tue Aug 9 13:34:48 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rBfd2c9668b504958651e89b7783a7fcae8e76cda6

Fix, cleanups, build errors

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

M	source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M	source/blender/io/usd/intern/usd_reader_mesh.cc

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

diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
index 296fc839a8a..3daf6b3b7a4 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
@@ -348,7 +348,7 @@ static const EnumPropertyItem *weight_paint_sample_enum_itemf(bContext *C,
             uint fidx = mp->totloop - 1;
 
             do {
-              const MDeformVert *dvert = &dvert[loops[mp->loopstart + fidx].v];
+              const MDeformVert *dvert = &dverts[loops[mp->loopstart + fidx].v];
               found |= weight_paint_sample_enum_itemf__helper(dvert, defbase_tot, groups);
             } while (fidx--);
           }
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 015874a9cd7..ab7ff79a5f3 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -1712,16 +1712,16 @@ static void lineart_identify_mlooptri_feature_edges(void *__restrict userdata,
 typedef struct LooseEdgeData {
   int loose_count;
   int loose_max;
-  const MEdge **loose_array;
+  MEdge const **loose_array;
   Mesh *me;
 } LooseEdgeData;
 
 static void lineart_loose_data_reallocate(LooseEdgeData *loose_data, int count)
 {
-  const MEdge **new_arr = MEM_callocN(sizeof(MEdge *) * count, "loose edge array");
+  MEdge **new_arr = MEM_callocN(sizeof(MEdge *) * count, "loose edge array");
   if (loose_data->loose_array) {
     memcpy(new_arr, loose_data->loose_array, sizeof(MEdge *) * loose_data->loose_max);
-    MEM_freeN(loose_data->loose_array);
+    MEM_SAFE_FREE(loose_data->loose_array);
   }
   loose_data->loose_max = count;
   loose_data->loose_array = new_arr;
@@ -2286,7 +2286,7 @@ static void lineart_geometry_object_load(LineartObjectInfo *ob_info,
       la_edge++;
       la_seg++;
     }
-    MEM_freeN(loose_data.loose_array);
+    MEM_SAFE_FREE(loose_data.loose_array);
   }
 
   MEM_freeN(edge_feat_data.edge_nabr);
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index f663fc23a86..28ed259e696 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -907,7 +907,7 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
      * the material slots that were created when the object was loaded from
      * USD are still valid now. */
     MutableSpan<MPoly> polygons = bke::mesh_polygons_for_write(*active_mesh);
-    if (!polygons.is_empty() > 0 && import_params_.import_materials) {
+    if (!polygons.is_empty() && import_params_.import_materials) {
       std::map<pxr::SdfPath, int> mat_map;
       assign_facesets_to_mpoly(motionSampleTime, polygons, &mat_map);
     }