diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-27 22:01:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-27 22:01:56 -0500 |
| commit | 74b5bfb98f0496a8e1519c4732bb5942e6fcc78a (patch) | |
| tree | 8963d2db094d4fb349a31364b907087a48b4bddf /indra/newview/pipeline.h | |
| parent | f0c2f99c25a4d73dac75203db881aaebaeeb25f6 (diff) | |
| parent | 4f8827d2a8fc37f88d271be20f8fa03b14ec5732 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 22a0ca6a2f..fd4813e415 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -437,7 +437,7 @@ public: RENDER_TYPE_PASS_SHINY = LLRenderPass::PASS_SHINY, RENDER_TYPE_PASS_BUMP = LLRenderPass::PASS_BUMP, RENDER_TYPE_PASS_POST_BUMP = LLRenderPass::PASS_POST_BUMP, - RENDER_TYPE_PASS_MATERIALS = LLRenderPass::PASS_MATERIALS, + RENDER_TYPE_PASS_MATERIAL = LLRenderPass::PASS_MATERIAL, RENDER_TYPE_PASS_GLOW = LLRenderPass::PASS_GLOW, RENDER_TYPE_PASS_ALPHA = LLRenderPass::PASS_ALPHA, RENDER_TYPE_PASS_ALPHA_MASK = LLRenderPass::PASS_ALPHA_MASK, |