diff options
| author | Oz Linden <oz@lindenlab.com> | 2020-06-15 15:29:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2020-06-15 15:29:04 -0400 |
| commit | 86009f885efc796850d3e5b612c896a9d737fb86 (patch) | |
| tree | 404923800dbc6d09ea72b10de0c7f4bb103d1e62 /indra/llrender/llvertexbuffer.h | |
| parent | 17598f936bb6b099f21fc32aa80b68258cdfd0b9 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
SL-10297: merge up to master at 6.4.3
Diffstat (limited to 'indra/llrender/llvertexbuffer.h')
| -rw-r--r-- | indra/llrender/llvertexbuffer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index c89d7e3958..9867bd16d6 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -179,8 +179,8 @@ public: TYPE_WEIGHT4, TYPE_CLOTHWEIGHT, TYPE_TEXTURE_INDEX, - TYPE_MAX, - TYPE_INDEX, + TYPE_MAX, // TYPE_MAX is the size/boundary marker for attributes that go in the vertex buffer + TYPE_INDEX, // TYPE_INDEX is beyond _MAX because it lives in a separate (index) buffer }; enum { MAP_VERTEX = (1<<TYPE_VERTEX), |