diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
| commit | c6d752b880cacca8fb8f10f28790a50161fcb9ab (patch) | |
| tree | 14910a69597962134f2e78e864a2f05962a16356 /indra/newview/lldrawpool.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 556760632a..4182819d6c 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -269,20 +269,20 @@ void LLFacePool::enqueue(LLFace* facep) } // virtual -BOOL LLFacePool::addFace(LLFace *facep) +bool LLFacePool::addFace(LLFace *facep) { addFaceReference(facep); - return TRUE; + return true; } // virtual -BOOL LLFacePool::removeFace(LLFace *facep) +bool LLFacePool::removeFace(LLFace *facep) { removeFaceReference(facep); vector_replace_with_last(mDrawFace, facep); - return TRUE; + return true; } // Not absolutely sure if we should be resetting all of the chained pools as well - djs @@ -328,9 +328,9 @@ void LLFacePool::pushFaceGeometry() } } -BOOL LLFacePool::verify() const +bool LLFacePool::verify() const { - BOOL ok = TRUE; + bool ok = true; for (std::vector<LLFace*>::const_iterator iter = mDrawFace.begin(); iter != mDrawFace.end(); iter++) @@ -340,11 +340,11 @@ BOOL LLFacePool::verify() const { LL_INFOS() << "Face in wrong pool!" << LL_ENDL; facep->printDebugInfo(); - ok = FALSE; + ok = false; } else if (!facep->verify()) { - ok = FALSE; + ok = false; } } @@ -356,7 +356,7 @@ void LLFacePool::printDebugInfo() const LL_INFOS() << "Pool " << this << " Type: " << getType() << LL_ENDL; } -BOOL LLFacePool::LLOverrideFaceColor::sOverrideFaceColor = FALSE; +bool LLFacePool::LLOverrideFaceColor::sOverrideFaceColor = false; void LLFacePool::LLOverrideFaceColor::setColor(const LLColor4& color) { @@ -682,7 +682,7 @@ bool LLRenderPass::uploadMatrixPalette(LLVOAvatar* avatar, LLMeshSkinInfo* skinI LLGLSLShader::sCurBoundShaderPtr->uniformMatrix3x4fv(LLViewerShaderMgr::AVATAR_MATRIX, count, - FALSE, + false, (GLfloat*)&(mpc.mGLMp[0])); return true; |