diff options
author | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
commit | a7911c43791a76f0f93f920f527970125afdc730 (patch) | |
tree | 99228045170856cf7721e83274bc9d74b45f42a4 /indra/llmath/tests/v4math_test.cpp | |
parent | 444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff) | |
parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) |
merge changes for 5.1.0-release
Diffstat (limited to 'indra/llmath/tests/v4math_test.cpp')
-rw-r--r-- | indra/llmath/tests/v4math_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llmath/tests/v4math_test.cpp b/indra/llmath/tests/v4math_test.cpp index 191ac864df..9779dfded3 100644 --- a/indra/llmath/tests/v4math_test.cpp +++ b/indra/llmath/tests/v4math_test.cpp @@ -355,7 +355,8 @@ namespace tut val3 = z1 + (z2 - z1)* val; val4 = w1 + (w2 - w1)* val; LLVector4 vec4b = lerp(vec4,vec4a,val); - ensure("lerp failed", ((val1 ==vec4b.mV[VX])&& (val2 ==vec4b.mV[VY]) && (val3 ==vec4b.mV[VZ])&& (val4 ==vec4b.mV[VW]))); + LLVector4 check(val1, val2, val3, val4); + ensure_equals("lerp failed", check, vec4b); } template<> template<> |