summaryrefslogtreecommitdiff
path: root/indra/newview/llsurfacepatch.cpp
diff options
context:
space:
mode:
authorMichael Pohoreski <ptolemy@lindenlab.com>2019-11-20 17:10:22 -0800
committerMichael Pohoreski <ptolemy@lindenlab.com>2019-11-20 17:10:22 -0800
commit4b205db468fd371dfe1bb30bb887e2ccbd7044ec (patch)
tree6d83efd5ebc0c2a462f33f1b385c5b415a93cb49 /indra/newview/llsurfacepatch.cpp
parent18eb8ac90ce409ba620f6fe8ff487e6195d9c3eb (diff)
parent24920de799c8e2dd26854923c7a10fc4a551dd5d (diff)
Merged lindenlab/viewer-eep into default
Diffstat (limited to 'indra/newview/llsurfacepatch.cpp')
-rw-r--r--indra/newview/llsurfacepatch.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp
index f6cf714db4..5e056944e9 100644
--- a/indra/newview/llsurfacepatch.cpp
+++ b/indra/newview/llsurfacepatch.cpp
@@ -203,7 +203,7 @@ 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() || !mSurfacep->getGridsPerEdge())
+ if (!mSurfacep || !mSurfacep->getRegion() || !mSurfacep->getGridsPerEdge() || !mVObjp)
{
return; // failsafe
}