livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1920: From Richard, fix for scale sliding when mouse goes in the opposite direction of the scale. 

I had discovered a set of bugs in the fix he sent me involving when the user decided to move the mouse in the opposite direction.  This fixes the bug where the scale would start sliding around.
meow-7.2.2
Ricky Curtice 2014-03-02 15:49:17 -08:00
parent e8a2d3b73b
commit 871bae45ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llmanipscale.cpp
View File

@ -1612,14 +1612,14 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
{
LLGLDepthTest gls_depth(GL_FALSE);
F32 dist_grid_axis = (drag_point - mScaleCenter) * mScaleDir;
F32 dist_grid_axis = llmax(0.f, (drag_point - mScaleCenter) * mScaleDir);
F32 smallest_subdivision1 = mScaleSnapUnit1 / sGridMaxSubdivisionLevel;
F32 smallest_subdivision2 = mScaleSnapUnit2 / sGridMaxSubdivisionLevel;
// find distance to nearest smallest grid unit
F32 grid_multiple1 = llfloor(llmax(0.f, dist_grid_axis) / smallest_subdivision1);
F32 grid_multiple2 = llfloor(llmax(0.f, dist_grid_axis) / smallest_subdivision2);
F32 grid_multiple1 = llfloor(dist_grid_axis / smallest_subdivision1);
F32 grid_multiple2 = llfloor(dist_grid_axis / smallest_subdivision2);
F32 grid_offset1 = fmodf(dist_grid_axis, smallest_subdivision1);
F32 grid_offset2 = fmodf(dist_grid_axis, smallest_subdivision2);