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

Fix #132660: Sculpt multires mask overlay skipped without face sets

Browse Source 
Overlay next code didn't account for 1618448abd.
This commit is contained in:
Hans Goudey
2025-01-06 11:53:19 -05:00
parent 11b006e01a
commit c4cb68e53b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/overlay/overlay_next_sculpt.hh
View File

@@ -186,9 +186,7 @@ class Sculpts : Overlay {
case blender::bke::pbvh::Type::Grids: {
const SubdivCCG &subdiv_ccg = *sculpt_session->subdiv_ccg;
const Mesh &base_mesh = *static_cast<const Mesh *>(object_orig->data);
if (!BKE_subdiv_ccg_key_top_level(subdiv_ccg).has_mask &&
!base_mesh.attributes().contains(".sculpt_face_set"))
{
if (subdiv_ccg.masks.is_empty() && !base_mesh.attributes().contains(".sculpt_face_set")) {
return;
}
break;

3
source/blender/editors/sculpt_paint/brushes/layer.cc
View File

@@ -226,7 +226,6 @@ static void calc_grids(const Depsgraph &depsgraph,
SculptSession &ss = *object.sculpt;
const StrokeCache &cache = *ss.cache;
SubdivCCG &subdiv_ccg = *ss.subdiv_ccg;
const CCGKey key = BKE_subdiv_ccg_key_top_level(subdiv_ccg);
const Span<int> grids = node.grids();
const OrigPositionData orig_data = orig_position_data_get_grids(object, node);
@@ -256,7 +255,7 @@ static void calc_grids(const Depsgraph &depsgraph,
subdiv_ccg, layer_displacement_factor.as_span(), grids, tls.displacement_factors);
offset_displacement_factors(displacement_factors, tls.factors, cache.bstrength);
if (key.has_mask) {
if (!subdiv_ccg.masks.is_empty()) {
tls.masks.resize(positions.size());
mask::gather_mask_grids(subdiv_ccg, grids, tls.masks);
}