blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Sculpt: Restrict expand to active mesh islands for geodesic and topology 

Fixes bug where other islands sometimes get their masks cleared (or
filled) in strange circumstances.  Still need to figure out the
correct behavior for spherical falloff.
This commit is contained in:
Joseph Eagar 2023-01-19 17:27:40 -08:00
parent 9889918fd4
commit 8b5c2d9ef1
Notes: blender-bot 2023-06-19 09:59:47 +02:00 
Referenced by issue #109112, Mask on mesh with multires modifier looks strange, behave broken
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/editors/sculpt_paint/sculpt_expand.c
View File

@ -390,6 +390,22 @@ static BLI_bitmap *sculpt_expand_boundary_from_enabled(SculptSession *ss,
return boundary_verts;
}
static void sculpt_expand_check_topology_islands(Object *ob)
{
SculptSession *ss = ob->sculpt;
ss->expand_cache->check_islands = ELEM(ss->expand_cache->falloff_type,
SCULPT_EXPAND_FALLOFF_GEODESIC,
SCULPT_EXPAND_FALLOFF_TOPOLOGY,
SCULPT_EXPAND_FALLOFF_BOUNDARY_TOPOLOGY);
if (ss->expand_cache->check_islands) {
SCULPT_topology_islands_ensure(ob);
ss->expand_cache->initial_island_key = SCULPT_vertex_island_get(
ss, ss->expand_cache->initial_active_vertex);
}
}
/* Functions implementing different algorithms for initializing falloff values. */
/**
@ -1250,6 +1266,11 @@ static void sculpt_expand_mask_update_task_cb(void *__restrict userdata,
const float initial_mask = *vd.mask;
const bool enabled = sculpt_expand_state_get(ss, expand_cache, vd.vertex);
if (expand_cache->check_islands &&
SCULPT_vertex_island_get(ss, vd.vertex) != expand_cache->initial_island_key) {
continue;
}
float new_mask;
if (enabled) {
@ -1842,6 +1863,9 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
return OPERATOR_FINISHED;
}
case SCULPT_EXPAND_MODAL_FALLOFF_GEODESIC: {
expand_cache->falloff_gradient = SCULPT_EXPAND_MODAL_FALLOFF_GEODESIC;
sculpt_expand_check_topology_islands(ob);
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
expand_cache,
sd,
@ -1851,6 +1875,9 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
break;
}
case SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY: {
expand_cache->falloff_gradient = SCULPT_EXPAND_FALLOFF_TOPOLOGY;
sculpt_expand_check_topology_islands(ob);
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
expand_cache,
sd,
@ -1860,6 +1887,9 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
break;
}
case SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY_DIAGONALS: {
expand_cache->falloff_gradient = SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY_DIAGONALS;
sculpt_expand_check_topology_islands(ob);
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
expand_cache,
sd,
@ -1869,6 +1899,7 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
break;
}
case SCULPT_EXPAND_MODAL_FALLOFF_SPHERICAL: {
expand_cache->check_islands = false;
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
expand_cache,
sd,
@ -2213,6 +2244,8 @@ static int sculpt_expand_invoke(bContext *C, wmOperator *op, const wmEvent *even
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
ss->expand_cache, sd, ob, ss->expand_cache->initial_active_vertex, falloff_type);
sculpt_expand_check_topology_islands(ob);
/* Initial mesh data update, resets all target data in the sculpt mesh. */
sculpt_expand_update_for_vertex(C, ob, ss->expand_cache->initial_active_vertex);

3
source/blender/editors/sculpt_paint/sculpt_intern.h
View File

@ -818,6 +818,9 @@ typedef struct ExpandCache {
float *original_mask;
int *original_face_sets;
float (*original_colors)[4];
int initial_island_key;
bool check_islands;
} ExpandCache;
/** \} */