blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: fix warnings from vcol limit commit

This commit is contained in:
Joseph Eagar 2022-08-31 09:43:52 -07:00
parent 30ec628d43
commit cdc0be48c9
Notes: blender-bot 2023-02-14 09:48:25 +01:00 
Referenced by issue #100747, Regression: Cannot add "String" attribute to mesh
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/mesh_validate.cc
View File

@ -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, "

16
source/blender/editors/mesh/mesh_data.cc
View File

@ -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);

1
source/blender/io/alembic/intern/abc_customdata.cc
View File

@ -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();