blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T81452: Incorrect trim lasso radius 

Added a fallback path to compute the
cursor radius for when the stroke
starts over a blank area of space
(in which case SCULPT_cursor_geometry_update
fails).
This commit is contained in:
Joseph Eagar 2022-04-25 13:10:23 -07:00
parent 891268aa82
commit 2bc0e8d304
Notes: blender-bot 2023-02-14 06:45:14 +01:00 
Referenced by issue #97544, Sculpt Trim: the Use Cursor for Depth option and radius change works only after the second time
Referenced by issue #81452, Policy for style guide: code comments
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/editors/sculpt_paint/paint_mask.c
View File

@ -1057,7 +1057,30 @@ static void sculpt_gesture_trim_calculate_depth(SculptGestureContext *sgcontext)
(trim_operation->depth_back + trim_operation->depth_front) * 0.5f;
}
const float depth_radius = ss->cursor_radius;
float depth_radius;
if (ss->gesture_initial_hit) {
depth_radius = ss->cursor_radius;
}
else {
/* ss->cursor_radius is only valid if the stroke started
* over the sculpt mesh. If it's not we must
* compute the radius ourselves. See T81452.
*/
Sculpt *sd = CTX_data_tool_settings(vc->C)->sculpt;
Brush *brush = BKE_paint_brush(&sd->paint);
Scene *scene = CTX_data_scene(vc->C);
if (!BKE_brush_use_locked_size(scene, brush)) {
depth_radius = paint_calc_object_space_radius(
vc, ss->gesture_initial_location, BKE_brush_size_get(scene, brush));
}
else {
depth_radius = BKE_brush_unprojected_radius_get(scene, brush);
}
}
trim_operation->depth_front = mid_point_depth - depth_radius;
trim_operation->depth_back = mid_point_depth + depth_radius;
}