diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-21 16:01:15 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-21 16:01:15 -0600 |
| commit | 0071e6576f694f9f8ed1bc6537a6201c08dc79dd (patch) | |
| tree | 5986423bc1e33615508c32ee32d558ccd0ce2de3 /indra/newview/pipeline.h | |
| parent | 17ca9f9ae7b80dd9797408487499e9d3168c6291 (diff) | |
| parent | 08f364bfc9aaeb771145d660287427c41b1dc0bf (diff) | |
merge
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 8b6532ca25..c6b2e20fa5 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -231,7 +231,7 @@ public: void postSort(LLCamera& camera); void forAllVisibleDrawables(void (*func)(LLDrawable*)); - void renderObjects(U32 type, U32 mask, BOOL texture = TRUE); + void renderObjects(U32 type, U32 mask, BOOL texture = TRUE, BOOL batch_texture = FALSE); void renderGroups(LLRenderPass* pass, U32 type, U32 mask, BOOL texture); void grabReferences(LLCullResult& result); @@ -408,7 +408,6 @@ public: RENDER_TYPE_PASS_ALPHA = LLRenderPass::PASS_ALPHA, RENDER_TYPE_PASS_ALPHA_MASK = LLRenderPass::PASS_ALPHA_MASK, RENDER_TYPE_PASS_FULLBRIGHT_ALPHA_MASK = LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, - RENDER_TYPE_PASS_ALPHA_SHADOW = LLRenderPass::PASS_ALPHA_SHADOW, // Following are object types (only used in drawable mRenderType) RENDER_TYPE_HUD = LLRenderPass::NUM_RENDER_TYPES, RENDER_TYPE_VOLUME, |