diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-05-10 15:16:06 +0200 |
|---|---|---|
| committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-05-10 15:16:06 +0200 |
| commit | 799ebf21624edb8b42ca16b8cf51c138643efd32 (patch) | |
| tree | 438df7d344821c75c65625353198542103b18f9f /indra/newview/gltf | |
| parent | 155ddf23363f1d5c534c69f50505faf67e51948f (diff) | |
Fix broken merge and BOOL/bool issues
Diffstat (limited to 'indra/newview/gltf')
| -rw-r--r-- | indra/newview/gltf/asset.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/gltf/asset.cpp b/indra/newview/gltf/asset.cpp index 42f064699c..5f2217a075 100644 --- a/indra/newview/gltf/asset.cpp +++ b/indra/newview/gltf/asset.cpp @@ -1092,7 +1092,7 @@ void Skin::uploadMatrixPalette(Asset& asset, Node& node) LLGLSLShader::sCurBoundShaderPtr->uniformMatrix3x4fv(LLViewerShaderMgr::AVATAR_MATRIX, mJoints.size(), - FALSE, + GL_FALSE, (GLfloat*)glmp.data()); } |