diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-29 12:03:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-29 12:03:33 -0500 |
| commit | 7c4fd34dce346171be603d6fe6e88cf56ebe2208 (patch) | |
| tree | 4a1e006a513191a2082ad2384eb9680f6b39a404 /indra/newview/llspatialpartition.cpp | |
| parent | 742b301059bb5235be9757492e6695cba9b754a0 (diff) | |
| parent | d81fde49f7927c94488c1eca24c07f4e52cbf54a (diff) | |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 5ba2a149b9..7c7b370bbb 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -4642,8 +4642,7 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset, mSpecColor(1.0f, 1.0f, 1.0f, 0.5f), mEnvIntensity(0.0f), mAlphaMaskCutoff(0.5f), - mDiffuseAlphaMode(0), - mMaterialID(NULL) + mDiffuseAlphaMode(0) { mVertexBuffer->validateRange(mStart, mEnd, mCount, mOffset); |