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

Add automatic falloff type switching to expand

This commit is contained in:
Pablo Dobarro 2021-01-14 02:03:49 +01:00
parent 81ac9f61b6
commit 24bbe05913
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,6 +539,7 @@ static int sculpt_expand_invoke(bContext *C, wmOperator *op, const wmEvent *even
/* Update object. */
BKE_sculpt_update_object_for_edit(depsgraph, ob, true, true, false);
SCULPT_vertex_random_access_ensure(ss);
SCULPT_boundary_info_ensure(ob);
SCULPT_undo_push_begin(ob, "expand");
/* Create the Expand Cache. */
@ -561,8 +562,14 @@ static int sculpt_expand_invoke(bContext *C, wmOperator *op, const wmEvent *even
sculpt_expand_initial_state_store(ob, ss->expand_cache);
/* Initialize the factors. */
eSculptExpandFalloffType falloff_type = SCULPT_EXPAND_FALLOFF_GEODESICS;
if (SCULPT_vertex_is_boundary(ss, initial_vertex)) {
falloff_type = SCULPT_EXPAND_FALLOFF_BOUNDARY_TOPOLOGY;
}
sculpt_expand_falloff_factors_from_vertex_and_symm_create(
ss->expand_cache, sd, ob, initial_vertex, SCULPT_EXPAND_FALLOFF_BOUNDARY_TOPOLOGY);
ss->expand_cache, sd, ob, initial_vertex, falloff_type);
/* Initial update. */
sculpt_expand_update_for_vertex(C, ob, initial_vertex);

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

@ -1175,12 +1175,15 @@ typedef struct ExpandCache {
int totnode;
bool invert;
bool mask_preserve_previous;
int update_face_set;
eSculptExpandTargetType target;
float *initial_mask;
int *initial_face_sets;
} ExpandCache;
typedef struct FilterCache {