diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-10 13:01:14 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-10 13:01:14 -0500 |
| commit | 2ee815478043c4d5845f094f744a055707dba0e0 (patch) | |
| tree | 7a34bf2b60eaf609af9f3e8dab20268ed720d75c /indra/newview/llmaniptranslate.cpp | |
| parent | f076bdf609ec1fe114a7d0222a318483c97c7a26 (diff) | |
SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index c4f8369cd0..a9b14829b2 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1519,6 +1519,7 @@ void LLManipTranslate::renderSnapGuides() F32 sz = mGridSizeMeters; F32 tiles = sz; + glMatrixMode(GL_TEXTURE); gGL.pushMatrix(); usc = 1.0f/usc; @@ -2243,7 +2244,7 @@ void LLManipTranslate::renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_ glRotatef(rot, axis.mV[0], axis.mV[1], axis.mV[2]); glScalef(mArrowScales.mV[index], mArrowScales.mV[index], mArrowScales.mV[index] * 1.5f); - gCone.render(CONE_LOD_HIGHEST); + gCone.render(); gGL.popMatrix(); } |