diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llmaniptranslate.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp index ac41068..7dbb470 100644 --- a/linden/indra/newview/llmaniptranslate.cpp +++ b/linden/indra/newview/llmaniptranslate.cpp | |||
@@ -38,7 +38,7 @@ | |||
38 | #include "llmaniptranslate.h" | 38 | #include "llmaniptranslate.h" |
39 | 39 | ||
40 | #include "llgl.h" | 40 | #include "llgl.h" |
41 | #include "llglimmediate.h" | 41 | #include "llrender.h" |
42 | 42 | ||
43 | #include "llagent.h" | 43 | #include "llagent.h" |
44 | #include "llbbox.h" | 44 | #include "llbbox.h" |
@@ -1535,10 +1535,10 @@ void LLManipTranslate::renderSnapGuides() | |||
1535 | LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GREATER); | 1535 | LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GREATER); |
1536 | glBindTexture(GL_TEXTURE_2D, sGridTex); | 1536 | glBindTexture(GL_TEXTURE_2D, sGridTex); |
1537 | gGL.flush(); | 1537 | gGL.flush(); |
1538 | gGL.blendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); | 1538 | gGL.blendFunc(LLRender::BF_ZERO, LLRender::BF_ONE_MINUS_SOURCE_ALPHA); |
1539 | renderGrid(u,v,tiles,0.9f, 0.9f, 0.9f,a*0.15f); | 1539 | renderGrid(u,v,tiles,0.9f, 0.9f, 0.9f,a*0.15f); |
1540 | gGL.flush(); | 1540 | gGL.flush(); |
1541 | gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); | 1541 | gGL.setSceneBlendType(LLRender::BT_ALPHA); |
1542 | } | 1542 | } |
1543 | 1543 | ||
1544 | { | 1544 | { |
@@ -1649,7 +1649,7 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, | |||
1649 | LLGLEnable stencil(GL_STENCIL_TEST); | 1649 | LLGLEnable stencil(GL_STENCIL_TEST); |
1650 | LLGLDepthTest depth (GL_TRUE, GL_FALSE, GL_ALWAYS); | 1650 | LLGLDepthTest depth (GL_TRUE, GL_FALSE, GL_ALWAYS); |
1651 | glStencilFunc(GL_ALWAYS, 0, stencil_mask); | 1651 | glStencilFunc(GL_ALWAYS, 0, stencil_mask); |
1652 | glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); | 1652 | gGL.setColorMask(false, false); |
1653 | LLImageGL::unbindTexture(0); | 1653 | LLImageGL::unbindTexture(0); |
1654 | glColor4f(1,1,1,1); | 1654 | glColor4f(1,1,1,1); |
1655 | 1655 | ||
@@ -1700,7 +1700,7 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, | |||
1700 | LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_CLOUDS); | 1700 | LLPipeline::toggleRenderType(LLPipeline::RENDER_TYPE_CLOUDS); |
1701 | } | 1701 | } |
1702 | 1702 | ||
1703 | glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); | 1703 | gGL.setColorMask(true, false); |
1704 | } | 1704 | } |
1705 | gGL.color4f(1,1,1,1); | 1705 | gGL.color4f(1,1,1,1); |
1706 | 1706 | ||