diff options
| author | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
| commit | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (patch) | |
| tree | a78f96c5ada866ec93cbba72f2c7bf1daf7ade80 /indra/llmath/llvolume.cpp | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
| parent | e328dcf4062177c903d3099d0d16477824d23025 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 761fc171c4..cc9744756f 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2904,7 +2904,7 @@ F32 LLVolume::sculptGetSurfaceArea() // compute the area of the quad by taking the length of the cross product of the two triangles LLVector3 cross1 = (p1 - p2) % (p1 - p3); LLVector3 cross2 = (p4 - p2) % (p4 - p3); - area += (cross1.magVec() + cross2.magVec()) / 2.0; + area += (cross1.magVec() + cross2.magVec()) / 2.f; } } @@ -5890,7 +5890,7 @@ F32 find_vertex_score(LLVCacheVertexData& data) } //bonus points for having low valence - F32 valence_boost = powf(data.mActiveTriangles, -FindVertexScore_ValenceBoostPower); + F32 valence_boost = powf((F32)data.mActiveTriangles, -FindVertexScore_ValenceBoostPower); score += FindVertexScore_ValenceBoostScale * valence_boost; return score; |