Skip to content

Commit 25cb812

Browse files
committed
Don't use clamp mode on av mesh.
1 parent 5c2c2a8 commit 25cb812

2 files changed

Lines changed: 2 additions & 15 deletions

File tree

indra/newview/llviewerjointmesh.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
255255
//----------------------------------------------------------------
256256
llassert( !(mTexture.notNull() && mLayerSet) ); // mutually exclusive
257257

258-
LLTexUnit::eTextureAddressMode old_mode = LLTexUnit::TAM_WRAP;
259258
LLViewerTexLayerSet *layerset = dynamic_cast<LLViewerTexLayerSet*>(mLayerSet);
260259
if (mTestImageName)
261260
{
@@ -292,19 +291,13 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
292291
else
293292
if ( !is_dummy && mTexture.notNull() )
294293
{
295-
if(mTexture->hasGLTexture())
296-
{
297-
old_mode = mTexture->getAddressMode();
298-
}
299294
gGL.getTexUnit(diffuse_channel)->bind(mTexture);
300-
gGL.getTexUnit(diffuse_channel)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
301295
}
302296
else
303297
{
304298
gGL.getTexUnit(diffuse_channel)->bind(LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT));
305299
}
306-
307-
300+
308301
U32 mask = sRenderMask;
309302

310303
U32 start = mMesh->mFaceVertexOffset;
@@ -349,12 +342,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
349342
gGL.getTexUnit(diffuse_channel)->setTextureBlendType(LLTexUnit::TB_MULT);
350343
}
351344

352-
if (mTexture.notNull() && !is_dummy)
353-
{
354-
gGL.getTexUnit(diffuse_channel)->bind(mTexture);
355-
gGL.getTexUnit(diffuse_channel)->setTextureAddressMode(old_mode);
356-
}
357-
358345
return triangle_count;
359346
}
360347

indra/newview/llviewertexlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ LLViewerTexLayerSetBuffer::LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner,
7676
S32 width, S32 height) :
7777
// ORDER_LAST => must render these after the hints are created.
7878
LLTexLayerSetBuffer(owner),
79-
LLViewerDynamicTexture( width, height, 4, LLViewerDynamicTexture::ORDER_LAST, TRUE ),
79+
LLViewerDynamicTexture( width, height, 4, LLViewerDynamicTexture::ORDER_LAST, FALSE ),
8080
mUploadPending(FALSE), // Not used for any logic here, just to sync sending of updates
8181
mNeedsUpload(FALSE),
8282
mNumLowresUploads(0),

0 commit comments

Comments
 (0)