Commit: fae955fdb11e49d8c2fad29da6546038ae7386db
Author: Joseph Eagar
Date: Wed Aug 31 10:04:23 2022 -0700
Branches: master
https://developer.blender.org/rBfae955fdb11e49d8c2fad29da6546038ae7386db
Fix merge error.
===================================================================
M source/blender/editors/mesh/mesh_data.cc
===================================================================
diff --git a/source/blender/editors/mesh/mesh_data.cc
b/source/blender/editors/mesh/mesh_data.cc
index 92350af857d..1511da810cb 100644
--- a/source/blender/editors/mesh/mesh_data.cc
+++ b/source/blender/editors/mesh/mesh_data.cc
@@ -454,7 +454,6 @@ static bool layers_poll(bContext *C)
int ED_mesh_sculpt_color_add(Mesh *me,
const char *name,
- const bool active_set,
const bool do_init,
ReportList *UNUSED(reports))
{
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
