diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-09-17 19:16:25 +0200 |
| commit | 25f8cbece402c0987e2035eb7721e21a9d2761c3 (patch) | |
| tree | f2408e7d1f7b58f49f8cefc5dda7dd56d08c98f8 /indra/newview/llvograss.cpp | |
| parent | 6f4d7c2d6d363aee60d2f3d1fe4ed4a251aaa11b (diff) | |
| parent | f378d2f95ad751ccf7456f79baba61d6c39f5c36 (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/newview/llvograss.cpp')
| -rw-r--r-- | indra/newview/llvograss.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index 6903af2619..67adcbb244 100644 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -596,7 +596,7 @@ U32 LLVOGrass::getPartitionType() const } LLGrassPartition::LLGrassPartition(LLViewerRegion* regionp) -: LLSpatialPartition(LLDrawPoolAlpha::VERTEX_DATA_MASK | LLVertexBuffer::MAP_TEXTURE_INDEX, true, regionp) +: LLSpatialPartition(static_cast<U32>(LLDrawPoolAlpha::VERTEX_DATA_MASK) | static_cast<U32>(LLVertexBuffer::MAP_TEXTURE_INDEX), true, regionp) { mDrawableType = LLPipeline::RENDER_TYPE_GRASS; mPartitionType = LLViewerRegion::PARTITION_GRASS; |