diff options
Diffstat (limited to 'linden/indra/newview/llspatialpartition.cpp')
-rw-r--r-- | linden/indra/newview/llspatialpartition.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp index cb115ff..520501e 100644 --- a/linden/indra/newview/llspatialpartition.cpp +++ b/linden/indra/newview/llspatialpartition.cpp | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "llviewerregion.h" | 43 | #include "llviewerregion.h" |
44 | #include "llcamera.h" | 44 | #include "llcamera.h" |
45 | #include "pipeline.h" | 45 | #include "pipeline.h" |
46 | #include "llglimmediate.h" | 46 | #include "llrender.h" |
47 | #include "lloctree.h" | 47 | #include "lloctree.h" |
48 | 48 | ||
49 | const F32 SG_OCCLUSION_FUDGE = 1.01f; | 49 | const F32 SG_OCCLUSION_FUDGE = 1.01f; |
@@ -2006,7 +2006,7 @@ void renderOctree(LLSpatialGroup* group) | |||
2006 | //render solid object bounding box, color | 2006 | //render solid object bounding box, color |
2007 | //coded by buffer usage and activity | 2007 | //coded by buffer usage and activity |
2008 | LLGLDepthTest depth(GL_TRUE, GL_FALSE); | 2008 | LLGLDepthTest depth(GL_TRUE, GL_FALSE); |
2009 | gGL.blendFunc(GL_SRC_ALPHA, GL_ONE); | 2009 | gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA); |
2010 | LLVector4 col; | 2010 | LLVector4 col; |
2011 | if (group->mBuilt > 0.f) | 2011 | if (group->mBuilt > 0.f) |
2012 | { | 2012 | { |
@@ -2094,7 +2094,7 @@ void renderOctree(LLSpatialGroup* group) | |||
2094 | drawBox(group->mObjectBounds[0], group->mObjectBounds[1]*1.01f+LLVector3(0.001f, 0.001f, 0.001f)); | 2094 | drawBox(group->mObjectBounds[0], group->mObjectBounds[1]*1.01f+LLVector3(0.001f, 0.001f, 0.001f)); |
2095 | 2095 | ||
2096 | glDepthMask(GL_TRUE); | 2096 | glDepthMask(GL_TRUE); |
2097 | gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); | 2097 | gGL.setSceneBlendType(LLRender::BT_ALPHA); |
2098 | 2098 | ||
2099 | if (group->mBuilt <= 0.f) | 2099 | if (group->mBuilt <= 0.f) |
2100 | { | 2100 | { |
@@ -2122,7 +2122,7 @@ void renderOctree(LLSpatialGroup* group) | |||
2122 | void renderVisibility(LLSpatialGroup* group, LLCamera* camera) | 2122 | void renderVisibility(LLSpatialGroup* group, LLCamera* camera) |
2123 | { | 2123 | { |
2124 | LLGLEnable blend(GL_BLEND); | 2124 | LLGLEnable blend(GL_BLEND); |
2125 | gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); | 2125 | gGL.setSceneBlendType(LLRender::BT_ALPHA); |
2126 | LLGLEnable cull(GL_CULL_FACE); | 2126 | LLGLEnable cull(GL_CULL_FACE); |
2127 | glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); | 2127 | glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); |
2128 | 2128 | ||
@@ -2498,7 +2498,7 @@ void LLSpatialPartition::renderDebug() | |||
2498 | 2498 | ||
2499 | LLGLDisable cullface(GL_CULL_FACE); | 2499 | LLGLDisable cullface(GL_CULL_FACE); |
2500 | LLGLEnable blend(GL_BLEND); | 2500 | LLGLEnable blend(GL_BLEND); |
2501 | gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); | 2501 | gGL.setSceneBlendType(LLRender::BT_ALPHA); |
2502 | LLImageGL::unbindTexture(0); | 2502 | LLImageGL::unbindTexture(0); |
2503 | gPipeline.disableLights(); | 2503 | gPipeline.disableLights(); |
2504 | 2504 | ||