diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
| commit | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch) | |
| tree | 44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/llmath/llvolume.cpp | |
| parent | e615660823e680e824d2db0f1a59917597e64a13 (diff) | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
Merge with viewer-development
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 0c6cf1dfae..761fc171c4 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) |