diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-20 21:56:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-20 21:56:16 -0500 |
| commit | d670fdac295629c1afb0bf2bcda50261d053eb5b (patch) | |
| tree | b524bd448324be85615e650cddd3119ed86152cd /indra/newview | |
| parent | ad3dd05f4aea5db735b1c21bfccb34625a03f11d (diff) | |
SH-113 Fix for crash on consolidate after generating LOD.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 85035fb961..3ef892f739 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2603,6 +2603,9 @@ void LLModelPreview::genLODs(S32 which_lod) target_model->mInvBindMatrix = base->mInvBindMatrix; target_model->mBindShapeMatrix = base->mBindShapeMatrix; + //copy material list + target_model->mMaterialList = base->mMaterialList; + if (!validate_model(target_model)) { llerrs << "Invalid model generated when creating LODs" << llendl; |