[Bf-blender-cvs] [c2a28f9f6cf] master: Cleanup: quiet compiler warnings

[Jacques Lucke]

Commit: c2a28f9f6cfad66b945700e5d62bd25765083241
Author: Jacques Lucke
Date:   Sun Jan 22 02:03:44 2023 +0100
Branches: master
https://developer.blender.org/rBc2a28f9f6cfad66b945700e5d62bd25765083241

Cleanup: quiet compiler warnings

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

M	source/blender/blenkernel/intern/image_partial_update.cc
M	source/blender/blenkernel/intern/multires.cc
M	source/blender/blenkernel/intern/multires_reshape.cc
M	source/blender/editors/object/object_bake.cc
M	source/blender/makesdna/DNA_modifier_types.h
M	source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc

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

diff --git a/source/blender/blenkernel/intern/image_partial_update.cc b/source/blender/blenkernel/intern/image_partial_update.cc
index ecf55d6b694..4de807c0706 100644
--- a/source/blender/blenkernel/intern/image_partial_update.cc
+++ b/source/blender/blenkernel/intern/image_partial_update.cc
@@ -276,7 +276,7 @@ struct TileChangeset {
     const int chunk_len = chunk_x_len * chunk_y_len;
 
     for (int chunk_index = 0; chunk_index < chunk_len; chunk_index++) {
-      chunk_dirty_flags_[chunk_index] = chunk_dirty_flags_[chunk_index] |
+      chunk_dirty_flags_[chunk_index] = chunk_dirty_flags_[chunk_index] ||
                                         other.chunk_dirty_flags_[chunk_index];
     }
     has_dirty_chunks_ |= other.has_dirty_chunks_;
diff --git a/source/blender/blenkernel/intern/multires.cc b/source/blender/blenkernel/intern/multires.cc
index 9b04435b91c..2c5c7ba72ee 100644
--- a/source/blender/blenkernel/intern/multires.cc
+++ b/source/blender/blenkernel/intern/multires.cc
@@ -751,7 +751,7 @@ static DerivedMesh *multires_dm_create_local(Scene *scene,
                                              bool alloc_paint_mask,
                                              MultiresFlags flags)
 {
-  MultiresModifierData mmd = {{nullptr}};
+  MultiresModifierData mmd{};
 
   mmd.lvl = lvl;
   mmd.sculptlvl = lvl;
diff --git a/source/blender/blenkernel/intern/multires_reshape.cc b/source/blender/blenkernel/intern/multires_reshape.cc
index 522e7632b94..536dade7463 100644
--- a/source/blender/blenkernel/intern/multires_reshape.cc
+++ b/source/blender/blenkernel/intern/multires_reshape.cc
@@ -84,7 +84,7 @@ bool multiresModifier_reshapeFromDeformModifier(Depsgraph *depsgraph,
                                                 MultiresModifierData *mmd,
                                                 ModifierData *deform_md)
 {
-  MultiresModifierData highest_mmd = *mmd;
+  MultiresModifierData highest_mmd = blender::dna::shallow_copy(*mmd);
   highest_mmd.sculptlvl = highest_mmd.totlvl;
   highest_mmd.lvl = highest_mmd.totlvl;
   highest_mmd.renderlvl = highest_mmd.totlvl;
diff --git a/source/blender/editors/object/object_bake.cc b/source/blender/editors/object/object_bake.cc
index 30805ff8ad2..da16c1eae60 100644
--- a/source/blender/editors/object/object_bake.cc
+++ b/source/blender/editors/object/object_bake.cc
@@ -221,7 +221,7 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l
   DerivedMesh *dm;
   MultiresModifierData *mmd = get_multires_modifier(scene, ob, 0);
   Mesh *me = (Mesh *)ob->data;
-  MultiresModifierData tmp_mmd = *mmd;
+  MultiresModifierData tmp_mmd = blender::dna::shallow_copy(*mmd);
 
   *lvl = mmd->lvl;
 
@@ -246,7 +246,7 @@ static DerivedMesh *multiresbake_create_hiresdm(Scene *scene, Object *ob, int *l
 {
   Mesh *me = (Mesh *)ob->data;
   MultiresModifierData *mmd = get_multires_modifier(scene, ob, 0);
-  MultiresModifierData tmp_mmd = *mmd;
+  MultiresModifierData tmp_mmd = blender::dna::shallow_copy(*mmd);
   DerivedMesh *cddm = CDDM_from_mesh(me);
   DerivedMesh *dm;
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index aa7df999cf5..fe35fea77ed 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1094,6 +1094,8 @@ typedef struct ExplodeModifierData {
 } ExplodeModifierData;
 
 typedef struct MultiresModifierData {
+  DNA_DEFINE_CXX_METHODS(MultiresModifierData)
+
   ModifierData modifier;
 
   char lvl, sculptlvl, renderlvl, totlvl;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
index 2142fa666cb..c4f275334a8 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_interpolate_curves.cc
@@ -238,7 +238,6 @@ static void compute_point_counts_per_child(const bke::CurvesGeometry &guide_curv
 {
   const OffsetIndices guide_points_by_curve = guide_curves.points_by_curve();
   threading::parallel_for(r_points_per_child.index_range(), 512, [&](const IndexRange range) {
-    int points_sum = 0;
     for (const int child_curve_i : range) {
       const int neighbor_count = all_neighbor_counts[child_curve_i];
       if (neighbor_count == 0) {
@@ -250,7 +249,6 @@ static void compute_point_counts_per_child(const bke::CurvesGeometry &guide_curv
       const int points_per_curve_in_group = points_per_curve_by_group.lookup_default(group, -1);
       if (points_per_curve_in_group != -1) {
         r_points_per_child[child_curve_i] = points_per_curve_in_group;
-        points_sum += points_per_curve_in_group;
         r_use_direct_interpolation[child_curve_i] = true;
         continue;
       }
@@ -268,7 +266,6 @@ static void compute_point_counts_per_child(const bke::CurvesGeometry &guide_curv
       const int points_in_child = std::max<int>(1, roundf(neighbor_points_weighted_sum));
       r_points_per_child[child_curve_i] = points_in_child;
       r_use_direct_interpolation[child_curve_i] = false;
-      points_sum += r_points_per_child[child_curve_i];
     }
   });
 }