diff options
| author | prep <prep@lindenlab.com> | 2012-06-06 12:00:21 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-06 12:00:21 -0400 |
| commit | 208d73f52497c7e4c15f21843428ffa6a3db7aaa (patch) | |
| tree | 33b8e5c9fa2a650a0487450cc914d80695d44856 | |
| parent | a48ee0e86ade940014cb5f58b8ab6f4517789455 (diff) | |
Render fix to remove blend artifacts on physics capsule. llphysics extension lib update (path-680, path-681).
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/autobuild.xml b/autobuild.xml index 03b28262f7..e5a7d2e154 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ <key>archive</key> <map> <key>hash</key> - <string>c76c5911b50f05f74906380cf3166cfd</string> + <string>2f8599b736cdeb504e0a4f5417957392</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/258579/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120601.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/258952/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120606.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -1122,9 +1122,9 @@ <key>archive</key> <map> <key>hash</key> - <string>ffcc6db1071acc3bff6756d3abf052b7</string> + <string>82689d3216121fb8ad7f0bae144ee6a7</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/258579/arch/Linux/installer/llphysicsextensions-0.1-linux-20120601.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/258952/arch/Linux/installer/llphysicsextensions-0.1-linux-20120606.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1134,9 +1134,9 @@ <key>archive</key> <map> <key>hash</key> - <string>85767c2c9c85f364cfe81278aab1b3b1</string> + <string>fdc1f6cb1497bf2e095d5c74316e7673</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/258579/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120601.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/258952/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120606.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d54accfea5..3531599764 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4385,8 +4385,7 @@ void LLPipeline::renderDebug() { //remove blending artifacts gGL.setColorMask(false, false); - llPathingLibInstance->renderPathBookend( gGL, LLPathingLib::LLPL_START ); - llPathingLibInstance->renderPathBookend( gGL, LLPathingLib::LLPL_END ); + llPathingLibInstance->renderSimpleShapeCapsuleID( gGL, id, pos ); gGL.setColorMask(true, false); LLGLEnable blend(GL_BLEND); gPathfindingProgram.uniform1f("alpha_scale", 0.90f); |