diff options
| author | Richard Linden <none@none> | 2012-02-08 19:55:28 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-08 19:55:28 -0800 |
| commit | bbdb390624bd1289b330beed0f7bf30b3c94af8a (patch) | |
| tree | 070d2b78c0902dcad2f0d6767ca0b21f93bdfef7 /indra/llmath/llvolume.cpp | |
| parent | dd2bf737e08b3457dcd982ece5e200499dacf7d8 (diff) | |
| parent | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index f08657a75c..cc9744756f 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2078,6 +2078,7 @@ LLVolume::LLVolume(const LLVolumeParams ¶ms, const F32 detail, const BOOL ge mFaceMask = 0x0; mDetail = detail; mSculptLevel = -2; + mSurfaceArea = 1.f; //only calculated for sculpts, defaults to 1 for all other prims mIsMeshAssetLoaded = FALSE; mLODScaleBias.setVec(1,1,1); mHullPoints = NULL; @@ -3144,6 +3145,8 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, { F32 area = sculptGetSurfaceArea(); + mSurfaceArea = area; + const F32 SCULPT_MAX_AREA = 384.f; if (area < SCULPT_MIN_AREA || area > SCULPT_MAX_AREA) |