Commit: d76004f48f46164a73b107a11f115d3c45e312ad Author: Joseph Eagar Date: Thu Jan 26 17:53:32 2023 -0800 Branches: master https://developer.blender.org/rBd76004f48f46164a73b107a11f115d3c45e312ad
Sculpt: Fix sculpt expand not switching falloff types properly =================================================================== M source/blender/editors/sculpt_paint/sculpt_expand.cc =================================================================== diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc index a125545c010..b6a71a69287 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc @@ -388,11 +388,11 @@ static BLI_bitmap *sculpt_expand_boundary_from_enabled(SculptSession *ss, return boundary_verts; } -static void sculpt_expand_check_topology_islands(Object *ob) +static void sculpt_expand_check_topology_islands(Object *ob, eSculptExpandFalloffType falloff_type) { SculptSession *ss = ob->sculpt; - ss->expand_cache->check_islands = ELEM(ss->expand_cache->falloff_type, + ss->expand_cache->check_islands = ELEM(falloff_type, SCULPT_EXPAND_FALLOFF_GEODESIC, SCULPT_EXPAND_FALLOFF_TOPOLOGY, SCULPT_EXPAND_FALLOFF_TOPOLOGY_DIAGONALS, @@ -1865,8 +1865,7 @@ 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 = true; - sculpt_expand_check_topology_islands(ob); + sculpt_expand_check_topology_islands(ob, SCULPT_EXPAND_FALLOFF_GEODESIC); sculpt_expand_falloff_factors_from_vertex_and_symm_create( expand_cache, @@ -1877,8 +1876,7 @@ 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_check_topology_islands(ob, SCULPT_EXPAND_FALLOFF_TOPOLOGY); sculpt_expand_falloff_factors_from_vertex_and_symm_create( expand_cache, @@ -1889,8 +1887,7 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event break; } case SCULPT_EXPAND_MODAL_FALLOFF_TOPOLOGY_DIAGONALS: { - expand_cache->falloff_gradient = true; - sculpt_expand_check_topology_islands(ob); + sculpt_expand_check_topology_islands(ob, SCULPT_EXPAND_FALLOFF_TOPOLOGY_DIAGONALS); sculpt_expand_falloff_factors_from_vertex_and_symm_create( expand_cache, @@ -2247,7 +2244,7 @@ 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); + sculpt_expand_check_topology_islands(ob, falloff_type); /* 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); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs