diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-12 16:24:05 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-12 16:24:05 -0400 |
| commit | a16a6034c25c5e78331ef1bd13485df8759456e5 (patch) | |
| tree | c1d1ef6f387daa81039b27a2cdb435a31c25b5d7 /indra/newview/llmaniptranslate.cpp | |
| parent | 5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rwxr-xr-x | indra/newview/llmaniptranslate.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 394db71fb9..b4259a456c 100755 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1285,12 +1285,12 @@ void LLManipTranslate::renderSnapGuides() { tick_start = selection_center + (translate_axis * (smallest_grid_unit_scale * (F32)i - offset_nearest_grid_unit)); - F32 cur_subdivisions = getSubdivisionLevel(tick_start, translate_axis, getMinGridScale()); - - if (fmodf((F32)(i + sub_div_offset), (max_subdivisions / cur_subdivisions)) != 0.f) + //No need check this condition to prevent tick position scaling (FIX MAINT-5207/5208) + //F32 cur_subdivisions = getSubdivisionLevel(tick_start, translate_axis, getMinGridScale()); + /*if (fmodf((F32)(i + sub_div_offset), (max_subdivisions / cur_subdivisions)) != 0.f) { continue; - } + }*/ // add in off-axis offset tick_start += (mSnapOffsetAxis * mSnapOffsetMeters); |