griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T61138: Difficulty in aligning handles of Stroke of type Curve

Browse Source 
The user has preference to select the center point for alignment.
But in this case, it was not available for selection.

Also prioritizes selection of the middle point over the handles.

Reviewed By: #user_interface, brecht

Differential Revision: https://developer.blender.org/D6780
This commit is contained in:
mano-wii
2020-02-10 08:17:26 -03:00
parent 795c4a3462
commit 14d1dc5df5
1 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/blender/editors/sculpt_paint/paint_curve.c
View File

@@ -87,39 +87,35 @@ static PaintCurvePoint *paintcurve_point_get_closest(
{
PaintCurvePoint *pcp, *closest = NULL;
int i;
float dist, closest_dist = FLT_MAX;
float closest_dist = threshold;
for (i = 0, pcp = pc->points; i < pc->tot_points; i++, pcp++) {
dist = len_manhattan_v2v2(pos, pcp->bez.vec[0]);
if (dist < threshold) {
if (dist < closest_dist) {
closest = pcp;
closest_dist = dist;
if (point) {
*point = SEL_F1;
}
}
float dist[3];
char point_sel = 0;
dist[0] = len_manhattan_v2v2(pos, pcp->bez.vec[0]);
dist[1] = len_manhattan_v2v2(pos, pcp->bez.vec[1]);
dist[2] = len_manhattan_v2v2(pos, pcp->bez.vec[2]);
if (dist[1] < closest_dist) {
closest_dist = dist[1];
point_sel = SEL_F2;
}
if (!ignore_pivot) {
dist = len_manhattan_v2v2(pos, pcp->bez.vec[1]);
if (dist < threshold) {
if (dist < closest_dist) {
closest = pcp;
closest_dist = dist;
if (point) {
*point = SEL_F2;
}
}
}
if (dist[0] < closest_dist) {
closest_dist = dist[0];
point_sel = SEL_F1;
}
dist = len_manhattan_v2v2(pos, pcp->bez.vec[2]);
if (dist < threshold) {
if (dist < closest_dist) {
closest = pcp;
closest_dist = dist;
if (point) {
*point = SEL_F3;
if (dist[2] < closest_dist) {
closest_dist = dist[2];
point_sel = SEL_F3;
}
if (point_sel) {
closest = pcp;
if (point) {
if (ignore_pivot && point_sel == SEL_F2) {
point_sel = (dist[0] < dist[2]) ? SEL_F1 : SEL_F3;
}
*point = point_sel;
}
}
}