diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-06 14:52:11 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-06 14:52:11 -0500 |
commit | 041f1c1b03e2eee5d08c2b37883ebf5d5f9671df (patch) | |
tree | 497c21c74f6aec3d2377d801324a6e6a2ea796fe /indra/llmath/llvolume.cpp | |
parent | d0da897b24c41983db5a848eced8e71520d85a1b (diff) | |
parent | 54bc900c952b964206d484aa0b92e42238819fc6 (diff) |
merge
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) |