blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

Cleanup: Perform cleanup on sculpt_automasking.cc #117651

Merged
Hans Goudey merged 4 commits from Sean-Kim/blender:cleanup-automask into main 2024-01-31 21:43:12 +01:00
Conversation 2 Commits 4 Files Changed 5 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df9490c0b5 - Show all commits

2
source/blender/editors/sculpt_paint/sculpt_cloth.cc
View File

@ -1556,7 +1556,7 @@ static int sculpt_cloth_filter_invoke(bContext *C, wmOperator *op, const wmEvent
RNA_float_get(op->ptr, "area_normal_radius"),
RNA_float_get(op->ptr, "strength"));
ss->filter_cache->automasking = auto_mask::cache_init(sd, nullptr, ob);
ss->filter_cache->automasking = auto_mask::cache_init(sd, ob);
const float cloth_mass = RNA_float_get(op->ptr, "cloth_mass");
const float cloth_damping = RNA_float_get(op->ptr, "cloth_damping");

2
source/blender/editors/sculpt_paint/sculpt_filter_color.cc
View File

@ -371,7 +371,7 @@ static int sculpt_color_filter_init(bContext *C, wmOperator *op)
RNA_float_get(op->ptr, "strength"));
filter::Cache *filter_cache = ss->filter_cache;
filter_cache->active_face_set = SCULPT_FACE_SET_NONE;
filter_cache->automasking = auto_mask::cache_init(sd, nullptr, ob);
filter_cache->automasking = auto_mask::cache_init(sd, ob);
return OPERATOR_PASS_THROUGH;
}

2
source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
View File

@ -1010,7 +1010,7 @@ static int sculpt_mesh_filter_start(bContext *C, wmOperator *op)
filter::Cache *filter_cache = ss->filter_cache;
filter_cache->active_face_set = SCULPT_FACE_SET_NONE;
filter_cache->automasking = auto_mask::cache_init(sd, nullptr, ob);
filter_cache->automasking = auto_mask::cache_init(sd, ob);
sculpt_filter_specific_init(filter_type, op, ss);