diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-07 08:40:59 +0100 |
| commit | c3cdb8ced6ad9cedf9a4b37d19d302c59d33d72c (patch) | |
| tree | f0c5484493ffc1319439f31b1df77bf9d818bdbb /indra/newview/pipeline.h | |
| parent | b89c31052802450ec59fee48ace4c66a713755ab (diff) | |
| parent | aad87303c88458c9db3c312d44e8a4b125de1fe3 (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 60e0b0ae8c..a096a887b0 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -444,7 +444,8 @@ public: static BOOL sForceOldBakedUpload; // If true will not use capabilities to upload baked textures. static S32 sUseOcclusion; // 0 = no occlusion, 1 = read only, 2 = read/write static BOOL sDelayVBUpdate; - static BOOL sFastAlpha; + static BOOL sAutoMaskAlphaDeferred; + static BOOL sAutoMaskAlphaNonDeferred; static BOOL sDisableShaders; // if TRUE, rendering will be done without shaders static BOOL sRenderBump; static BOOL sUseTriStrips; |