blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'master' of git@git.blender.org:blender.git into blender2.8

This commit is contained in:
Germano Cavalcante 2017-07-11 17:06:43 -03:00
parent 1b91b443e0 3f39719b5d
commit ac76a3caba
Notes: blender-bot 2023-02-14 06:45:16 +01:00 
Referenced by issue #52179, Black objects in Eevee
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/transform/transform_snap_object.c
View File

@ -1170,15 +1170,12 @@ static float dist_squared_to_projected_aabb(
vb2d[0] *= data->win_half[0];
vb2d[1] *= data->win_half[1];
//float dvec[2], edge[2], rdist;
//sub_v2_v2v2(dvec, data->mval, va2d);
//sub_v2_v2v2(edge, vb2d, va2d);
float rdist;
short dvec[2] = {data->mval[0] - va2d[0], data->mval[1] - va2d[1]};
short edge[2] = {vb2d[0] - va2d[0], vb2d[1] - va2d[1]};
float lambda = dvec[0] * edge[0] + dvec[1] * edge[1];
float dvec[2], edge[2], lambda, rdist;
sub_v2_v2v2(dvec, data->mval, va2d);
sub_v2_v2v2(edge, vb2d, va2d);
lambda = dot_v2v2(dvec, edge);
if (lambda != 0.0f) {
lambda /= edge[0] * edge[0] + edge[1] * edge[1];
lambda /= len_squared_v2(edge);
if (lambda <= 0.0f) {
rdist = len_squared_v2v2(data->mval, va2d);
r_axis_closest[main_axis] = true;