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

Merge https://github.com/Lirusaito/SingularityViewer/tree/Release

Browse Source 
# Conflicts:
#	indra/newview/app_settings/settings_sh.xml
This commit is contained in:
Shyotl
2017-03-27 23:25:33 -05:00
parent 97a6f3a7b2 0dfef2ab25
commit f95be54bd5
71 changed files with 9187 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/pipeline.cpp
View File

@@ -6932,7 +6932,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
LLGLEnable test(GL_ALPHA_TEST);
gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
LLRenderTarget& render_target = LLPipeline::sRenderDeferred ? mFinalScreen : mScreen;
render_target.bindTexture(0, 0);