diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-02 14:14:19 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-02 14:14:19 -0700 |
| commit | e4bac71ac38f04eca96f4e3c932b51bd0d7432a1 (patch) | |
| tree | 0a46938a5ff98ff6550ba2b3787d2b8597b5e41c /indra/newview/llvovolume.cpp | |
| parent | d78ed764b538cf0fa0eba3e39fbbf99ef059660a (diff) | |
Fix shader link fail from forward decl of wrong soft clip func in class 1.
Fix trying to bind diffuse maps for shader without uniform in shadow shaders.
Clean up merge fail around mShaderLevel namechange.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index d6bd9c3b66..7e7bc1112d 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4974,7 +4974,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, if ( type == LLRenderPass::PASS_ALPHA && facep->getTextureEntry()->getMaterialParams().notNull() && !facep->getVertexBuffer()->hasDataType(LLVertexBuffer::TYPE_TANGENT) - && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 1) + && LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 1) { LL_WARNS_ONCE("RenderMaterials") << "Oh no! No binormals for this alpha blended face!" << LL_ENDL; } |