diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-05 11:33:35 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-05 11:33:35 -0800 |
| commit | ebad60bf1dcd6839ac57ced2edc93de0daffd8b9 (patch) | |
| tree | 06b363497bafb5a95715228f59f3e096bbdfb685 | |
| parent | c9664666358c5b3d8d79f31f5f0e3cb6528f1f8d (diff) | |
| parent | 88292104d9a2332e6169f2add8f0b590bb22dbff (diff) | |
Merge with SVN render-pipeline-8 branch
| -rw-r--r-- | indra/llmath/llvolume.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index afa82ed399..ddd1b4b3db 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -1690,9 +1690,11 @@ LLVolume::LLVolume(const LLVolumeParams ¶ms, const F32 detail, const BOOL ge mGenerateSingleFace = generate_single_face; - generate(); + mLODScaleBias.setVec(1,1,1); + if (mParams.getSculptID().isNull() && params.getSculptType() == LL_SCULPT_TYPE_NONE) { + generate(); createVolumeFaces(); } } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index dcc2b7dd22..1a1d29ac32 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8989,6 +8989,7 @@ void LLPipeline::LLMeshThread::run() { LLVolumeParams volume_params; volume_params.setType(LL_PCODE_PROFILE_SQUARE, LL_PCODE_PATH_LINE); + volume_params.setSculptID(mMeshID, LL_SCULPT_TYPE_MESH); mVolume = new LLVolume(volume_params, mDetail); mVolume->createVolumeFacesFromStream(buffer_stream); } |