[Bf-blender-cvs] [373e69b94e1] master: Merge branch 'blender-v3.3-release'

[Joseph Eagar]

Commit: 373e69b94e1a11fa86c8d1547782126a422ed2d2
Author: Joseph Eagar
Date:   Wed Aug 31 09:46:33 2022 -0700
Branches: master
https://developer.blender.org/rB373e69b94e1a11fa86c8d1547782126a422ed2d2

Merge branch 'blender-v3.3-release'

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



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

diff --cc source/blender/editors/mesh/mesh_data.cc
index 8e6723f5f0c,88caa191b18..92350af857d
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@@ -449,7 -489,28 +452,11 @@@ static bool layers_poll(bContext *C
  
  /*********************** Sculpt Vertex colors operators ************************/
  
- int ED_mesh_sculpt_color_add(Mesh *me, const char *name, const bool do_init, ReportList *reports)
 -static bool sculpt_vertex_color_remove_poll(bContext *C)
 -{
 -  if (!layers_poll(C)) {
 -    return false;
 -  }
 -
 -  Object *ob = ED_object_context(C);
 -  Mesh *me = static_cast<Mesh *>(ob->data);
 -  CustomData *vdata = GET_CD_DATA(me, vdata);
 -  const int active = CustomData_get_active_layer(vdata, CD_PROP_COLOR);
 -  if (active != -1) {
 -    return true;
 -  }
 -
 -  return false;
 -}
 -
+ 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. */