diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
commit | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (patch) | |
tree | 2c5bacebcb27b78d318b6e162334488f6e515974 /indra/newview/llspatialpartition.cpp | |
parent | b7f8a2479249646c7fb38ead195d5197ab733c94 (diff) | |
parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) |
merge up to 3.4.4
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r-- | indra/newview/llspatialpartition.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 3bb8e60787..2083afdcf5 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -3500,6 +3500,8 @@ void renderPhysicsShapes(LLSpatialGroup* group) LLViewerObject* object = drawable->getVObj(); if (object && object->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH) { + gGL.pushMatrix(); + gGL.multMatrix((F32*) object->getRegion()->mRenderMatrix.mMatrix); //push face vertices for terrain for (S32 i = 0; i < drawable->getNumFaces(); ++i) { @@ -3521,6 +3523,7 @@ void renderPhysicsShapes(LLSpatialGroup* group) } } } + gGL.popMatrix(); } } } |