diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-23 16:41:54 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-23 16:41:54 +0200 |
| commit | 4a29c73403c4dc713a8a31cb96289adff2b910c1 (patch) | |
| tree | de0c6b191031bac7fb2764edb2a81382a331f81c /dep/g3dlite/source/Triangle.cpp | |
| parent | b90329d63acaecb1f074dd2b303561baa9f639a2 (diff) | |
| parent | 1255434882777053bca06656786abc1a598deda9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'dep/g3dlite/source/Triangle.cpp')
| -rw-r--r-- | dep/g3dlite/source/Triangle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dep/g3dlite/source/Triangle.cpp b/dep/g3dlite/source/Triangle.cpp index 253438ad5fb..e1b5f8e051b 100644 --- a/dep/g3dlite/source/Triangle.cpp +++ b/dep/g3dlite/source/Triangle.cpp @@ -172,7 +172,7 @@ bool Triangle::intersect(const Ray& ray, float& distance, float baryCoord[3]) co // This is a new hit, closer than the previous one distance = t; - baryCoord[0] = 1.0 - u - v; + baryCoord[0] = 1.0f - u - v; baryCoord[1] = u; baryCoord[2] = v; |