diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-17 01:12:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-17 01:12:52 -0500 |
| commit | b2cf07f53ca9f0ab82d466063af8307631c50f31 (patch) | |
| tree | b0d9d4709ca926cbb49b53f4483bdf6b5bad62ff /indra/newview/llmaterialeditor.cpp | |
| parent | dc1ed195119d9ccc2b21111ea16663ffce4942c8 (diff) | |
WIP - switch PBR implementations
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index b4e5e14885..bdc66a85fc 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -204,14 +204,14 @@ void LLMaterialEditor::setAlbedoUploadId(const LLUUID& id) LLColor4 LLMaterialEditor::getAlbedoColor() { - LLColor4 ret = LLColor4(childGetValue("albedo color")); + LLColor4 ret = linearColor4(LLColor4(childGetValue("albedo color"))); ret.mV[3] = getTransparency(); return ret; } void LLMaterialEditor::setAlbedoColor(const LLColor4& color) { - childSetValue("albedo color", color.getValue()); + childSetValue("albedo color", srgbColor4(color).getValue()); setTransparency(color.mV[3]); } |
