More set but unused fun
parent
db03c5037f
commit
9bde3ecb89
|
|
@ -2368,7 +2368,7 @@ bool LLVolume::unpackVolumeFacesInternal(const LLSD& mdl)
|
||||||
|
|
||||||
const LLSD::Binary& pos = mdl[i]["Position"].asBinary();
|
const LLSD::Binary& pos = mdl[i]["Position"].asBinary();
|
||||||
const LLSD::Binary& norm = mdl[i]["Normal"].asBinary();
|
const LLSD::Binary& norm = mdl[i]["Normal"].asBinary();
|
||||||
const LLSD::Binary& tangent = mdl[i]["Tangent"].asBinary();
|
// const LLSD::Binary& tangent = mdl[i]["Tangent"].asBinary(); // <FS:Beq/> more set but unused
|
||||||
const LLSD::Binary& tc = mdl[i]["TexCoord0"].asBinary();
|
const LLSD::Binary& tc = mdl[i]["TexCoord0"].asBinary();
|
||||||
const LLSD::Binary& idx = mdl[i]["TriangleList"].asBinary();
|
const LLSD::Binary& idx = mdl[i]["TriangleList"].asBinary();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ LLCubeMapArray::LLCubeMapArray(LLCubeMapArray& lhs, U32 width, U32 count) : mTex
|
||||||
GLint components = GL_RGB;
|
GLint components = GL_RGB;
|
||||||
if (mImage->getComponents() == 4)
|
if (mImage->getComponents() == 4)
|
||||||
components = GL_RGBA;
|
components = GL_RGBA;
|
||||||
GLint format = GL_RGB;
|
// GLint format = GL_RGB; // <FS:Beq/> unused
|
||||||
|
|
||||||
// Handle different resolutions by scaling the image
|
// Handle different resolutions by scaling the image
|
||||||
LLPointer<LLImageRaw> src_image = new LLImageRaw(lhs.mWidth, lhs.mWidth, lhs.mImage->getComponents());
|
LLPointer<LLImageRaw> src_image = new LLImageRaw(lhs.mWidth, lhs.mWidth, lhs.mImage->getComponents());
|
||||||
|
|
|
||||||
|
|
@ -608,7 +608,7 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
|
||||||
// on faces with GLTF textures we use a spectal vertex buffer with other transforms
|
// on faces with GLTF textures we use a spectal vertex buffer with other transforms
|
||||||
if (const LLTextureEntry* te = getTextureEntry())
|
if (const LLTextureEntry* te = getTextureEntry())
|
||||||
{
|
{
|
||||||
if (LLGLTFMaterial* gltf_mat = te->getGLTFRenderMaterial())
|
if (te->getGLTFRenderMaterial())
|
||||||
{
|
{
|
||||||
vertex_buffer = mVertexBufferGLTF.get();
|
vertex_buffer = mVertexBufferGLTF.get();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue