[Bf-blender-cvs] [33066542cad] temp_bmesh_multires: MIssed a flag in bli_strict_types.h

[Joseph Eagar]

Commit: 33066542cad28cdfca20f51a34d8db4a841bc33d
Author: Joseph Eagar
Date:   Sun May 23 21:34:20 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB33066542cad28cdfca20f51a34d8db4a841bc33d

MIssed a flag in bli_strict_types.h

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

M	source/blender/blenkernel/intern/customdata.c
M	source/blender/blenlib/BLI_strict_flags.h
M	source/blender/bmesh/intern/bmesh_log.c

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 1c5792461ca..acd5007e3ee 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1504,14 +1504,14 @@ static bool layerValidate_propfloat2(void *data, const uint totitems, const bool
   return has_errors;
 }
 
-void layerDynTopoVert_copy(const void *source, void *dest, int count)
+static void layerDynTopoVert_copy(const void *source, void *dest, int count)
 {
   const MDynTopoVert *mv = (MDynTopoVert *)dest;
 
   memcpy(dest, source, count * sizeof(MDynTopoVert));
 }
 
-void layerDynTopoVert_interp(
+static void layerDynTopoVert_interp(
     const void **sources, const float *weights, const float *sub_weights, int count, void *dest)
 {
   float co[3], no[3], origmask, color[4];
diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h
index dd5435e06cd..efe89dffa97 100644
--- a/source/blender/blenlib/BLI_strict_flags.h
+++ b/source/blender/blenlib/BLI_strict_flags.h
@@ -51,6 +51,7 @@
 #    pragma clang diagnostic error "-Wimplicit-float-conversion"
 #    pragma clang diagnostic error "-Wimplicit-int-conversion"
 #    pragma clang diagnostic error "-Wimplicit-int"
+#    pragma clang diagnostic error "-Wshadow"
 #  else
 #    pragma warning(error : 4018) /* signed/unsigned mismatch */
 #    pragma warning(error : 4244) /* conversion from 'type1' to 'type2', possible loss of data */
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index f59ec2deb50..db5daf69b60 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -465,7 +465,7 @@ static void bm_log_faces_unmake(
 
     BMLoop *ls[3] = {f->l_first, f->l_first->next, f->l_first->prev};
 
-    for (int i = 0; i < 3; i++) {
+    for (i = 0; i < 3; i++) {
       if (lf->customdata[i]) {
         CustomData_bmesh_copy_data(
             &bm->ldata, &entry->ldata, ls[i]->head.data, &lf->customdata[i]);