griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Debug build failure and warnings after recent cleanup commit

Browse Source
This commit is contained in:
Hans Goudey
2023-02-23 13:21:17 -05:00
parent 4369627e71
commit 2bd097a58d
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc
View File

@@ -440,7 +440,6 @@ static bool weight_paint_set(Object *ob, float paintweight)
Mesh *me = static_cast<Mesh *>(ob->data);
MDeformWeight *dw, *dw_prev;
int vgroup_active, vgroup_mirror = -1;
uint index;
const bool topology = (me->editflag & ME_EDIT_MIRROR_TOPO) != 0;
/* mutually exclusive, could be made into a */
@@ -473,7 +472,7 @@ static bool weight_paint_set(Object *ob, float paintweight)
const MPoly &poly = polys[i];
uint fidx = poly.totloop - 1;
if ((paint_selmode == SCE_SELECT_FACE) && !(select_poly && select_poly[index])) {
if ((paint_selmode == SCE_SELECT_FACE) && !(select_poly && select_poly[i])) {
continue;
}
@@ -517,7 +516,7 @@ static bool weight_paint_set(Object *ob, float paintweight)
{
MDeformVert *dv = dvert;
for (index = me->totvert; index != 0; index--, dv++) {
for (int index = me->totvert; index != 0; index--, dv++) {
dv->flag = 0;
}
}

6
source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
View File

@@ -2574,10 +2574,10 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
else {
face_edges[k] = new_edge->link_edge_groups[flip]->open_face_edge;
}
BLI_assert(k == 0 || medge[face_edges[k]].v2 == face_verts[k - 1] ||
medge[face_edges[k]].v1 == face_verts[k - 1]);
BLI_assert(k == 0 || edges[face_edges[k]].v2 == face_verts[k - 1] ||
edges[face_edges[k]].v1 == face_verts[k - 1]);
BLI_assert(face_edges[k] == MOD_SOLIDIFY_EMPTY_TAG ||
medge[face_edges[k]].v2 == new_v1 || medge[face_edges[k]].v1 == new_v1);
edges[face_edges[k]].v2 == new_v1 || edges[face_edges[k]].v1 == new_v1);
face_verts[k++] = new_v1;
}
prior_edge = new_edge;

4
source/blender/modifiers/intern/MOD_weighted_normal.cc
View File

@@ -456,15 +456,13 @@ static void wn_face_area(WeightedNormalModifierData *wnmd, WeightedNormalData *w
const blender::Span<MPoly> polys = wn_data->polys;
const blender::Span<MLoop> loops = wn_data->loops;
int mp_index;
ModePair *face_area = static_cast<ModePair *>(
MEM_malloc_arrayN(size_t(polys.size()), sizeof(*face_area), __func__));
ModePair *f_area = face_area;
for (const int i : polys.index_range()) {
f_area->val = BKE_mesh_calc_poly_area(&polys[i], &loops[polys[i].loopstart], positions);
f_area->index = mp_index;
f_area->index = i;
}
qsort(face_area, polys.size(), sizeof(*face_area), modepair_cmp_by_val_inverse);