Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Testicular Slingshot
Alchemy Viewer
Commits
54f024f2
Commit
54f024f2
authored
Feb 20, 2020
by
Rye Mutt
🍞
Browse files
Fix #39 and potentially fix #26 cause by incorrect texture wrapping mode on local bakes
parent
3c65fecb
Changes
2
Hide whitespace changes
Inline
Side-by-side
indra/newview/llviewerjointmesh.cpp
View file @
54f024f2
...
...
@@ -245,7 +245,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
//----------------------------------------------------------------
llassert
(
!
(
mTexture
.
notNull
()
&&
mLayerSet
)
);
// mutually exclusive
LLTexUnit
::
eTextureAddressMode
old_mode
=
LLTexUnit
::
TAM_WRAP
;
LLViewerTexLayerSet
*
layerset
=
dynamic_cast
<
LLViewerTexLayerSet
*>
(
mLayerSet
);
if
(
mTestImageName
)
{
...
...
@@ -272,22 +271,15 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
gGL
.
getTexUnit
(
diffuse_channel
)
->
bind
(
LLViewerTextureManager
::
getFetchedTexture
(
IMG_DEFAULT
));
}
}
else
if
(
!
is_dummy
&&
mTexture
.
notNull
()
)
else
if
(
!
is_dummy
&&
mTexture
.
notNull
()
)
{
if
(
mTexture
->
hasGLTexture
())
{
old_mode
=
mTexture
->
getAddressMode
();
}
gGL
.
getTexUnit
(
diffuse_channel
)
->
bind
(
mTexture
);
gGL
.
getTexUnit
(
diffuse_channel
)
->
setTextureAddressMode
(
LLTexUnit
::
TAM_CLAMP
);
}
else
{
gGL
.
getTexUnit
(
diffuse_channel
)
->
bind
(
LLViewerTextureManager
::
getFetchedTexture
(
IMG_DEFAULT
));
}
U32
mask
=
sRenderMask
;
U32
start
=
mMesh
->
mFaceVertexOffset
;
...
...
@@ -333,12 +325,6 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
gGL
.
getTexUnit
(
diffuse_channel
)
->
setTextureBlendType
(
LLTexUnit
::
TB_MULT
);
}
if
(
mTexture
.
notNull
()
&&
!
is_dummy
)
{
gGL
.
getTexUnit
(
diffuse_channel
)
->
bind
(
mTexture
);
gGL
.
getTexUnit
(
diffuse_channel
)
->
setTextureAddressMode
(
old_mode
);
}
return
triangle_count
;
}
...
...
indra/newview/llviewertexlayer.cpp
View file @
54f024f2
...
...
@@ -76,7 +76,7 @@ LLViewerTexLayerSetBuffer::LLViewerTexLayerSetBuffer(LLTexLayerSet* const owner,
S32
width
,
S32
height
)
:
// ORDER_LAST => must render these after the hints are created.
LLTexLayerSetBuffer
(
owner
),
LLViewerDynamicTexture
(
width
,
height
,
4
,
LLViewerDynamicTexture
::
ORDER_LAST
,
TRU
E
),
LLViewerDynamicTexture
(
width
,
height
,
4
,
LLViewerDynamicTexture
::
ORDER_LAST
,
FALS
E
),
mNeedsUpload
(
FALSE
),
// Not used for any logic here, just to sync sending of updates
mNumLowresUploads
(
0
),
mUploadPending
(
FALSE
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment