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

Cleanup: Sculpt: Remove unnecessary deform flushing function

Browse Source 
We now deform the active shape key and other original data while deforming
the evaluated/deformed positions, rather than before, when we delayed that to
afterwards and affected the entire mesh no matter the area sculpted. This is all
handled by `write_translations` now.
This commit is contained in:
Hans Goudey
2024-08-08 12:29:50 -04:00
parent f09395c69e
commit 3acb5ae41b
3 changed files with 0 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
source/blender/editors/sculpt_paint/sculpt.cc
View File

@@ -3800,26 +3800,6 @@ static void do_brush_action(const Scene &scene,
ups.last_stroke_valid = true;
}
/* Flush displacement from deformed bke::pbvh::Tree vertex to original mesh. */
static void sculpt_flush_pbvhvert_deform(SculptSession &ss,
const PBVHVertexIter &vd,
MutableSpan<float3> positions)
{
float disp[3], newco[3];
int index = vd.vert_indices[vd.i];
sub_v3_v3v3(disp, vd.co, ss.deform_cos[index]);
mul_m3_v3(ss.deform_imats[index].ptr(), disp);
add_v3_v3v3(newco, disp, ss.orig_cos[index]);
ss.deform_cos[index] = vd.co;
ss.orig_cos[index] = newco;
if (!ss.shapekey_active) {
copy_v3_v3(positions[index], newco);
}
}
} // namespace blender::ed::sculpt_paint
/**
@@ -3839,56 +3819,6 @@ static void sculpt_update_keyblock(Object &ob)
}
}
void SCULPT_flush_stroke_deform(const Sculpt & /*sd*/, Object &ob, bool is_proxy_used)
{
using namespace blender;
using namespace blender::ed::sculpt_paint;
SculptSession &ss = *ob.sculpt;
if (is_proxy_used && ss.deform_modifiers_active) {
/* This brushes aren't using proxies, so sculpt_combine_proxies() wouldn't propagate needed
* deformation to original base. */
Mesh *mesh = (Mesh *)ob.data;
Vector<bke::pbvh::Node *> nodes;
Array<float3> vertCos;
if (ss.shapekey_active) {
/* Mesh could have isolated verts which wouldn't be in BVH, to deal with this we copy old
* coordinates over new ones and then update coordinates for all vertices from BVH. */
vertCos = ss.orig_cos;
}
nodes = bke::pbvh::search_gather(*ss.pbvh, {});
MutableSpan<float3> positions = mesh->vert_positions_for_write();
threading::parallel_for(nodes.index_range(), 1, [&](IndexRange range) {
for (const int i : range) {
PBVHVertexIter vd;
BKE_pbvh_vertex_iter_begin (*ss.pbvh, nodes[i], vd, PBVH_ITER_UNIQUE) {
sculpt_flush_pbvhvert_deform(ss, vd, positions);
if (vertCos.is_empty()) {
continue;
}
int index = vd.vert_indices[vd.i];
copy_v3_v3(vertCos[index], ss.orig_cos[index]);
}
BKE_pbvh_vertex_iter_end;
}
});
if (!vertCos.is_empty()) {
SCULPT_vertcos_to_key(ob, ss.shapekey_active, vertCos);
}
}
else if (ss.shapekey_active) {
sculpt_update_keyblock(ob);
}
}
void SCULPT_cache_calc_brushdata_symm(blender::ed::sculpt_paint::StrokeCache &cache,
const ePaintSymmetryFlags symm,
const char axis,

4
source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
View File

@@ -2306,10 +2306,6 @@ static void sculpt_mesh_filter_apply(bContext *C, wmOperator *op)
ss.filter_cache->iteration_count++;
if (ss.deform_modifiers_active || ss.shapekey_active) {
SCULPT_flush_stroke_deform(sd, ob, true);
}
flush_update_step(C, UpdateType::Position);
}

5
source/blender/editors/sculpt_paint/sculpt_intern.hh
View File

@@ -773,11 +773,6 @@ void flush_update_done(const bContext *C, Object &ob, UpdateType update_type);
void SCULPT_pbvh_clear(Object &ob);
/**
* Flush displacement from deformed blender::bke::pbvh::Tree to original layer.
*/
void SCULPT_flush_stroke_deform(const Sculpt &sd, Object &ob, bool is_proxy_used);
/**
* Should be used after modifying the mask or Face Sets IDs.
*/