[Bf-blender-cvs] [2d4498e457d] master: Merge branch 'blender-v3.3-release'
Hans Goudey
noreply at git.blender.org
Tue Aug 2 18:14:30 CEST 2022
Commit: 2d4498e457d308d29b4617ba681f332262bc8ddf
Author: Hans Goudey
Date: Tue Aug 2 11:09:22 2022 -0500
Branches: master
https://developer.blender.org/rB2d4498e457d308d29b4617ba681f332262bc8ddf
Merge branch 'blender-v3.3-release'
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_pbvh.h
index 2f4618e6f7a,5641ff0ba34..af7effe806c
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@@ -427,7 -308,7 +427,7 @@@ void BKE_pbvh_node_fully_unmasked_set(P
bool BKE_pbvh_node_fully_unmasked_get(PBVHNode *node);
void BKE_pbvh_mark_rebuild_pixels(PBVH *pbvh);
- void BKE_pbvh_vert_mark_update(PBVH *pbvh, PBVHVertRef vertex);
-void BKE_pbvh_vert_tag_update_normal(PBVH *pbvh, int index);
++void BKE_pbvh_vert_tag_update_normal(PBVH *pbvh, PBVHVertRef vertex);
void BKE_pbvh_node_get_grids(PBVH *pbvh,
PBVHNode *node,
diff --cc source/blender/blenkernel/intern/pbvh.c
index 0ec7a79f890,8c1f19f0909..ac3eac70c39
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@@ -1953,10 -1964,10 +1953,10 @@@ bool BKE_pbvh_node_fully_unmasked_get(P
return (node->flag & PBVH_Leaf) && (node->flag & PBVH_FullyUnmasked);
}
- void BKE_pbvh_vert_mark_update(PBVH *pbvh, PBVHVertRef index)
-void BKE_pbvh_vert_tag_update_normal(PBVH *pbvh, int index)
++void BKE_pbvh_vert_tag_update_normal(PBVH *pbvh, PBVHVertRef vertex)
{
- BLI_assert(pbvh->type == PBVH_FACES);
- pbvh->vert_bitmap[index] = true;
+ BLI_assert(pbvh->header.type == PBVH_FACES);
- pbvh->vert_bitmap[index.i] = true;
++ pbvh->vert_bitmap[vertex.i] = true;
}
void BKE_pbvh_node_get_loops(PBVH *pbvh,
@@@ -2112,9 -2123,9 +2112,9 @@@ void BKE_pbvh_node_get_bm_orco_data(PBV
*r_orco_coords = node->bm_orco;
}
- bool BKE_pbvh_node_vert_update_check_any(PBVH *pbvh, PBVHNode *node)
+ bool BKE_pbvh_node_has_vert_with_normal_update_tag(PBVH *pbvh, PBVHNode *node)
{
- BLI_assert(pbvh->type == PBVH_FACES);
+ BLI_assert(pbvh->header.type == PBVH_FACES);
const int *verts = node->vert_indices;
const int totvert = node->uniq_verts + node->face_verts;
@@@ -2980,7 -2991,7 +2980,7 @@@ void BKE_pbvh_vert_coords_apply(PBVH *p
/* no need for float comparison here (memory is exactly equal or not) */
if (memcmp(mvert->co, vertCos[a], sizeof(float[3])) != 0) {
copy_v3_v3(mvert->co, vertCos[a]);
- BKE_pbvh_vert_mark_update(pbvh, BKE_pbvh_make_vref(a));
- BKE_pbvh_vert_tag_update_normal(pbvh, a);
++ BKE_pbvh_vert_tag_update_normal(pbvh, BKE_pbvh_make_vref(a));
}
}
diff --cc source/blender/editors/sculpt_paint/paint_mask.c
index a5389f7fd83,b861d0c84da..2e57886fd95
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@@ -1439,7 -1437,7 +1439,7 @@@ static void project_line_gesture_apply_
}
add_v3_v3(vd.co, disp);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(sgcontext->ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(sgcontext->ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(sgcontext->ss->pbvh, vd.vertex);
}
any_updated = true;
}
diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 2366089cefb,4b902b7fca9..17acf8d884e
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -345,14 -342,12 +345,13 @@@ void SCULPT_vertex_visible_set(SculptSe
{
switch (BKE_pbvh_type(ss->pbvh)) {
case PBVH_FACES:
- SET_FLAG_FROM_TEST(ss->mvert[index].flag, !visible, ME_HIDE);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, index);
+ SET_FLAG_FROM_TEST(ss->mvert[vertex.i].flag, !visible, ME_HIDE);
- BKE_pbvh_vert_mark_update(ss->pbvh, vertex);
break;
- case PBVH_BMESH:
- BM_elem_flag_set(BM_vert_at_index(ss->bm, index), BM_ELEM_HIDDEN, !visible);
+ case PBVH_BMESH: {
+ BMVert *v = (BMVert *)vertex.i;
+ BM_elem_flag_set(v, BM_ELEM_HIDDEN, !visible);
break;
+ }
case PBVH_GRIDS:
break;
}
@@@ -1444,17 -1407,16 +1442,16 @@@ static void paint_mesh_restore_co_task_
else {
copy_v3_v3(vd.fno, orig_data.no);
}
+ if (vd.mvert) {
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
+ }
}
else if (orig_data.unode->type == SCULPT_UNDO_MASK) {
*vd.mask = orig_data.mask;
}
else if (orig_data.unode->type == SCULPT_UNDO_COLOR) {
- SCULPT_vertex_color_set(ss, vd.index, orig_data.col);
+ SCULPT_vertex_color_set(ss, vd.vertex, orig_data.col);
}
-
- if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- }
}
BKE_pbvh_vertex_iter_end;
}
@@@ -3081,7 -3043,7 +3078,7 @@@ static void do_gravity_task_cb_ex(void
mul_v3_v3fl(proxy[vd.i], offset, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
diff --cc source/blender/editors/sculpt_paint/sculpt_boundary.c
index face0be0500,390fcb9648a..8d08c338b93
--- a/source/blender/editors/sculpt_paint/sculpt_boundary.c
+++ b/source/blender/editors/sculpt_paint/sculpt_boundary.c
@@@ -706,7 -671,7 +706,7 @@@ static void do_boundary_brush_bend_task
add_v3_v3(target_co, boundary->bend.pivot_positions[vd.index]);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -752,7 -717,7 +752,7 @@@ static void do_boundary_brush_slide_tas
strength);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -798,7 -763,7 +798,7 @@@ static void do_boundary_brush_inflate_t
strength);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -841,7 -806,7 +841,7 @@@ static void do_boundary_brush_grab_task
boundary->edit_info[vd.index].strength_factor * mask * automask * strength);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -895,7 -860,7 +895,7 @@@ static void do_boundary_brush_twist_tas
add_v3_v3(target_co, boundary->twist.pivot_position);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -954,7 -919,7 +954,7 @@@ static void do_boundary_brush_smooth_ta
target_co, vd.co, disp, boundary->edit_info[vd.index].strength_factor * mask * strength);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
diff --cc source/blender/editors/sculpt_paint/sculpt_brush_types.c
index cd989032f7b,c607dd02a77..245cbe0f54e
--- a/source/blender/editors/sculpt_paint/sculpt_brush_types.c
+++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.c
@@@ -320,7 -320,7 +320,7 @@@ static void do_draw_brush_task_cb_ex(vo
mul_v3_v3fl(proxy[vd.i], offset, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -418,7 -418,7 +418,7 @@@ static void do_fill_brush_task_cb_ex(vo
mul_v3_v3fl(proxy[vd.i], val, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -516,7 -516,7 +516,7 @@@ static void do_scrape_brush_task_cb_ex(
mul_v3_v3fl(proxy[vd.i], val, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -634,7 -634,7 +634,7 @@@ static void do_clay_thumb_brush_task_cb
mul_v3_v3fl(proxy[vd.i], val, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -789,7 -789,7 +789,7 @@@ static void do_flatten_brush_task_cb_ex
mul_v3_v3fl(proxy[vd.i], val, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
}
@@@ -946,7 -946,7 +946,7 @@@ static void do_clay_brush_task_cb_ex(vo
mul_v3_v3fl(proxy[vd.i], val, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
}
BKE_pbvh_vertex_iter_end;
@@@ -1072,7 -1072,7 +1072,7 @@@ static void do_clay_strips_brush_task_c
mul_v3_v3fl(proxy[vd.i], val, fade);
if (vd.mvert) {
- BKE_pbvh_vert_mark_update(ss->pbvh, vd.vertex);
- BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.index);
++ BKE_pbvh_vert_tag_update_normal(ss->pbvh, vd.vertex);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list