[Bf-blender-cvs] [cdc0be48c95] blender-v3.3-release: Cleanup: fix warnings from vcol limit commit

Joseph Eagar noreply at git.blender.org
Wed Aug 31 18:44:13 CEST 2022


Commit: cdc0be48c95c379b75143a60e935a416d99eb8bf
Author: Joseph Eagar
Date:   Wed Aug 31 09:43:52 2022 -0700
Branches: blender-v3.3-release
https://developer.blender.org/rBcdc0be48c95c379b75143a60e935a416d99eb8bf

Cleanup: fix warnings from vcol limit commit

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

M	source/blender/blenkernel/intern/mesh_validate.cc
M	source/blender/editors/mesh/mesh_data.cc
M	source/blender/io/alembic/intern/abc_customdata.cc

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

diff --git a/source/blender/blenkernel/intern/mesh_validate.cc b/source/blender/blenkernel/intern/mesh_validate.cc
index d17885e1214..5231c550fa7 100644
--- a/source/blender/blenkernel/intern/mesh_validate.cc
+++ b/source/blender/blenkernel/intern/mesh_validate.cc
@@ -1017,7 +1017,6 @@ bool BKE_mesh_validate_all_customdata(CustomData *vdata,
       pdata, mask.pmask, totpoly, do_verbose, do_fixes, &is_change_p);
 
   const int tot_uvloop = CustomData_number_of_layers(ldata, CD_MLOOPUV);
-  const int tot_vcolloop = CustomData_number_of_layers(ldata, CD_PROP_BYTE_COLOR);
   if (tot_uvloop > MAX_MTFACE) {
     PRINT_ERR(
         "\tMore UV layers than %d allowed, %d last ones won't be available for render, shaders, "
diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc
index c850e2f1e7a..88caa191b18 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -368,8 +368,11 @@ bool ED_mesh_uv_remove_named(Mesh *me, const char *name)
   return false;
 }
 
-int ED_mesh_color_add(
-    Mesh *me, const char *name, const bool active_set, const bool do_init, ReportList *reports)
+int ED_mesh_color_add(Mesh *me,
+                      const char *name,
+                      const bool active_set,
+                      const bool do_init,
+                      ReportList *UNUSED(reports))
 {
   /* NOTE: keep in sync with #ED_mesh_uv_add. */
 
@@ -503,8 +506,11 @@ static bool sculpt_vertex_color_remove_poll(bContext *C)
   return false;
 }
 
-int ED_mesh_sculpt_color_add(
-    Mesh *me, const char *name, const bool active_set, const bool do_init, ReportList *reports)
+int ED_mesh_sculpt_color_add(Mesh *me,
+                             const char *name,
+                             const bool active_set,
+                             const bool do_init,
+                             ReportList *UNUSED(reports))
 {
   /* NOTE: keep in sync with #ED_mesh_uv_add. */
 
@@ -529,7 +535,7 @@ int ED_mesh_sculpt_color_add(
   }
   else {
     layernum = CustomData_number_of_layers(&me->vdata, CD_PROP_COLOR);
-    
+
     if (CustomData_has_layer(&me->vdata, CD_PROP_COLOR) && do_init) {
       const MPropCol *color_data = (const MPropCol *)CustomData_get_layer(&me->vdata,
                                                                           CD_PROP_COLOR);
diff --git a/source/blender/io/alembic/intern/abc_customdata.cc b/source/blender/io/alembic/intern/abc_customdata.cc
index 35be9f9fc4d..6664417823c 100644
--- a/source/blender/io/alembic/intern/abc_customdata.cc
+++ b/source/blender/io/alembic/intern/abc_customdata.cc
@@ -564,7 +564,6 @@ void read_custom_data(const std::string &iobject_full_name,
   }
 
   int num_uvs = 0;
-  int num_colors = 0;
 
   const size_t num_props = prop.getNumProperties();



More information about the Bf-blender-cvs mailing list