diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-04 09:19:25 -0700 |
| commit | c2c060d4401d3a79a9ae0076af0c9b86d14f7f37 (patch) | |
| tree | b7efcf3c2e38aa9de488342b3379b4bde0a6bc47 /indra/newview/llvopartgroup.h | |
| parent | d44c85c6dc575c0c67019ce1bffecfaa5bc275d1 (diff) | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
Merge with 3.6.7
Diffstat (limited to 'indra/newview/llvopartgroup.h')
| -rwxr-xr-x | indra/newview/llvopartgroup.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvopartgroup.h b/indra/newview/llvopartgroup.h index 2befb01823..724e915d02 100755 --- a/indra/newview/llvopartgroup.h +++ b/indra/newview/llvopartgroup.h @@ -42,8 +42,7 @@ public: //vertex buffer for holding all particles static LLPointer<LLVertexBuffer> sVB; - static S32 sVBSlotFree[LL_MAX_PARTICLE_COUNT]; - static S32* sVBSlotCursor; + static S32 sVBSlotCursor; static void initClass(); static void restoreGL(); @@ -57,6 +56,7 @@ public: LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR | + LLVertexBuffer::MAP_EMISSIVE | LLVertexBuffer::MAP_TEXTURE_INDEX }; @@ -91,10 +91,12 @@ public: LLStrider<LLVector3>& normalsp, LLStrider<LLVector2>& texcoordsp, LLStrider<LLColor4U>& colorsp, + LLStrider<LLColor4U>& emissivep, LLStrider<U16>& indicesp); void updateFaceSize(S32 idx) { } F32 getPartSize(S32 idx); + void getBlendFunc(S32 idx, U32& src, U32& dst); LLUUID getPartOwner(S32 idx); LLUUID getPartSource(S32 idx); |