blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Sculpt Expand: Force all enabled when cursor not over the mesh

This commit is contained in:
Pablo Dobarro 2021-02-11 18:47:48 +01:00
parent faccaee6c3
commit 0b9aaaf97f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,10 @@ static bool sculpt_expand_state_get(SculptSession *ss, ExpandCache *expand_cache
return false;
}
if (expand_cache->all_enabled) {
return true;
}
bool enabled = false;
if (expand_cache->snap) {
@ -178,6 +182,10 @@ static bool sculpt_expand_face_state_get(SculptSession *ss, ExpandCache *expand_
return false;
}
if (expand_cache->all_enabled) {
return true;
}
bool enabled = false;
if (expand_cache->snap_enabled_face_sets) {
@ -1124,9 +1132,11 @@ static void sculpt_expand_update_for_vertex(bContext *C, Object *ob, const int v
/* Update the active factor in the cache. */
if (vertex == SCULPT_EXPAND_VERTEX_NONE) {
expand_cache->active_factor = expand_cache->max_falloff_factor;
expand_cache->all_enabled = true;
}
else {
expand_cache->active_factor = expand_cache->falloff_factor[vertex];
expand_cache->all_enabled = false;
}
if (expand_cache->target == SCULPT_EXPAND_TARGET_FACE_SETS) {

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

@ -1190,6 +1190,7 @@ typedef struct ExpandCache {
float max_face_falloff_factor;
float active_factor;
bool all_enabled;
float initial_mouse[2];
int initial_active_vertex;