MAINT-5207 Build: Snap to grid / Grid options broken, object snaps to incorrect Units

FIXED
- Decrase the minimal dev. pix. width to 3. That should be enought.
- Remove the mouse down offset from the snapping algorithm. IMHO it shouldn't be here. Snapping should be right on the mosue pointer.
meow-7.2.2
ruslantproductengine 2016-06-02 15:09:09 +03:00
parent 85d92553d8
commit 956c412aa4
2 changed files with 3 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/**
/**
* @file llmanip.h
* @brief LLManip class definition
*
@ -37,7 +37,7 @@ class LLToolComposite;
class LLVector3;
class LLObjectSelection;
const S32 MIN_DIVISION_PIXEL_WIDTH = 9;
const S32 MIN_DIVISION_PIXEL_WIDTH = 3;
class LLManip : public LLTool
{

View File

@ -1,4 +1,4 @@
/**
/**
* @file llmaniptranslate.cpp
* @brief LLManipTranslate class implementation
*
@ -548,12 +548,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
if (off_axis_magnitude > mSnapOffsetMeters)
{
mInSnapRegime = TRUE;
LLVector3 mouse_down_offset(mDragCursorStartGlobal - mDragSelectionStartGlobal);
LLVector3 cursor_snap_agent = gAgent.getPosAgentFromGlobal(cursor_point_snap_line);
if (!gSavedSettings.getBOOL("SnapToMouseCursor"))
{
cursor_snap_agent -= mouse_down_offset;
}
F32 cursor_grid_dist = (cursor_snap_agent - mGridOrigin) * axis_f;