diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-19 07:48:05 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-19 07:48:05 -0700 |
| commit | 6adc6d71a7147a7f53f266bb05cd0157e34f9f4b (patch) | |
| tree | ad3b8886cd2c09cc1510db6a8c2e2e87ffafb441 /indra/newview/lldrawpoolavatar.h | |
| parent | 8bccedd163f1eb25c631e8501bdd468c24e6bf40 (diff) | |
| parent | f9ff68b5e3b016a53fe987e5b51442741ca88f15 (diff) | |
Merge viewer-dev-materials
Diffstat (limited to 'indra/newview/lldrawpoolavatar.h')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index b87449fbf6..bb9126c162 100644 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -114,6 +114,7 @@ public: void beginRiggedGlow(); void beginDeferredRiggedAlpha(); void beginDeferredRiggedMaterial(S32 pass); + void beginDeferredRiggedMaterialAlpha(S32 pass); void endRiggedSimple(); void endRiggedFullbright(); @@ -124,6 +125,7 @@ public: void endRiggedGlow(); void endDeferredRiggedAlpha(); void endDeferredRiggedMaterial(S32 pass); + void endDeferredRiggedMaterialAlpha(S32 pass); void beginDeferredRiggedSimple(); void beginDeferredRiggedBump(); @@ -149,7 +151,7 @@ public: void renderDeferredRiggedSimple(LLVOAvatar* avatar); void renderDeferredRiggedBump(LLVOAvatar* avatar); void renderDeferredRiggedMaterial(LLVOAvatar* avatar, S32 pass); - + typedef enum { RIGGED_MATERIAL=0, |