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/lldrawpool.h | |
| parent | f0c2f99c25a4d73dac75203db881aaebaeeb25f6 (diff) | |
| parent | 4f8827d2a8fc37f88d271be20f8fa03b14ec5732 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/davep-materials
Diffstat (limited to 'indra/newview/lldrawpool.h')
| -rw-r--r-- | indra/newview/lldrawpool.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index caa57ad583..77067cc1ec 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -134,7 +134,22 @@ public: PASS_SHINY, PASS_BUMP, PASS_POST_BUMP, - PASS_MATERIALS, + PASS_MATERIAL, + PASS_MATERIAL_ALPHA, + PASS_MATERIAL_ALPHA_MASK, + PASS_MATERIAL_ALPHA_GLOW, + PASS_SPECMAP, + PASS_SPECMAP_BLEND, + PASS_SPECMAP_MASK, + PASS_SPECMAP_GLOW, + PASS_NORMMAP, + PASS_NORMMAP_BLEND, + PASS_NORMMAP_MASK, + PASS_NORMMAP_GLOW, + PASS_NORMSPEC, + PASS_NORMSPEC_BLEND, + PASS_NORMSPEC_MASK, + PASS_NORMSPEC_GLOW, PASS_GLOW, PASS_ALPHA, PASS_ALPHA_MASK, |