diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
| commit | 0277259455c4354f81ea8a24c8ab93f27567bc6f (patch) | |
| tree | f1411dab563dcf697f794e9e8a592a6d3e5c4d2d /indra/newview/llsurfacepatch.cpp | |
| parent | 568397bbcc4fca307ebc010ec7f815422b9ba80a (diff) | |
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llsurfacepatch.cpp')
| -rw-r--r-- | indra/newview/llsurfacepatch.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp index 4be7cf41e7..8d30ebbcda 100644 --- a/indra/newview/llsurfacepatch.cpp +++ b/indra/newview/llsurfacepatch.cpp @@ -183,6 +183,11 @@ LLVector2 LLSurfacePatch::getTexCoords(const U32 x, const U32 y) const void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3 *vertex, LLVector3 *normal, LLVector2 *tex0, LLVector2 *tex1) { + if (!mSurfacep || !mSurfacep->getRegion()) + { + return; // failsafe + } + U32 surface_stride = mSurfacep->getGridsPerEdge(); U32 point_offset = x + y*surface_stride; |