Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers

Browse Source 
Conflicts:
	indra/cmake/00-Common.cmake
	indra/newview/llvovolume.cpp
This commit is contained in:
Drake Arconis
2012-07-02 20:16:56 +00:00
parent ece9dda7b4 e6689f830a
commit c464a8da30
93 changed files with 3912 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lldrawpoolavatar.cpp
View File

@@ -265,7 +265,9 @@ void LLDrawPoolAvatar::beginPostDeferredAlpha()
sRenderingSkinned = TRUE;
gPipeline.bindDeferredShader(*sVertexProgram);
sVertexProgram->setMinimumAlpha(0.2f);
sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
}