livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19838 Put local lights back on fullbright objects. Fix assert in modelpreview.

meow-7.2.2
RunitaiLinden 2023-06-14 14:07:11 -05:00
parent b81aadae1b
commit 7fb024cfc2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
View File

@ -429,13 +429,12 @@ void main()
LIGHT_LOOP(6)
LIGHT_LOOP(7)
light *= 1.0-emissive;
color += light;
glare *= 1.0-emissive;
glare = min(glare, 1.0);
float al = max(diffcol.a, glare) * vertex_color.a;
frag_color = max(vec4(color, al), vec4(0));
#else // mode is not DIFFUSE_ALPHA_MODE_BLEND, encode to gbuffer

2
indra/newview/llmodelpreview.cpp
View File

@ -3726,6 +3726,8 @@ BOOL LLModelPreview::render()
const std::string& binding = instance.mModel->mMaterialList[i];
const LLImportMaterial& material = instance.mMaterial[binding];
buffer->unmapBuffer();
buffer->setBuffer();
gGL.diffuseColor4fv(material.mDiffuseColor.mV);
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);