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

Merge branch 'V2Renderer' into V2TextureSystem

Browse Source 
Conflicts:
	indra/newview/llviewercontrol.cpp
This commit is contained in:
Shyotl
2011-04-23 19:33:20 -05:00
parent 7b1736ea9d f7a5394904
commit ac12349a8a
22 changed files with 238 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/pipeline.h
View File

@@ -99,7 +99,7 @@ public:
void setDisableVBOMapping(BOOL no_vbo_mapping);
void generateImpostor(LLVOAvatar* avatar);
void bindScreenToTexture();
void renderBloom(BOOL for_snapshot, F32 zoom_factor = 1.f, int subfield = 0);
void renderBloom(BOOL for_snapshot, F32 zoom_factor = 1.f, int subfield = 0, bool tiling = false);
void init();
void cleanup();