Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T65632: Connected Proportional Editing is affected by Curve Object's Local Scale

Browse Source 
Make curve vertex distance take into account the object scale.
This commit is contained in:
Sebastian Parborg
2019-06-14 17:17:15 +02:00
parent a5a0f158e3
commit 33571be2af
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/transform/transform_conversions.c
View File

@@ -1835,7 +1835,12 @@ static void calc_distanceCurveVerts(TransData *head, TransData *tail)
} }
else if (td_near) { else if (td_near) {
float dist; float dist;
dist = len_v3v3(td_near->center, td->center); float vec[3];
sub_v3_v3v3(vec, td_near->center, td->center);
mul_m3_v3(head->mtx, vec);
dist = len_v3(vec);
if (dist < (td - 1)->dist) { if (dist < (td - 1)->dist) {
td->dist = (td - 1)->dist; td->dist = (td - 1)->dist;
} }
@@ -1856,7 +1861,12 @@ static void calc_distanceCurveVerts(TransData *head, TransData *tail)
} }
else if (td_near) { else if (td_near) {
float dist; float dist;
dist = len_v3v3(td_near->center, td->center); float vec[3];
sub_v3_v3v3(vec, td_near->center, td->center);
mul_m3_v3(head->mtx, vec);
dist = len_v3(vec);
if (td->flag & TD_NOTCONNECTED || dist < td->dist || (td + 1)->dist < td->dist) { if (td->flag & TD_NOTCONNECTED || dist < td->dist || (td + 1)->dist < td->dist) {
td->flag &= ~TD_NOTCONNECTED; td->flag &= ~TD_NOTCONNECTED;
if (dist < (td + 1)->dist) { if (dist < (td + 1)->dist) {