diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-31 15:20:02 -0500 |
| commit | 94afae5b1552439f69126ecf7cd6716fa692fed6 (patch) | |
| tree | 52abb39e749f4c2e2835e89ff3afd39034d34fba /indra/llprimitive | |
| parent | 29e344bbd0043bb1cd5f1defd6f9a193b0cc728e (diff) | |
| parent | 4cb5439e425dbfd354a27cbfbfe071904d068d5d (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp index 6164234d6c..9743bad7a7 100644 --- a/indra/llprimitive/llgltfmaterial.cpp +++ b/indra/llprimitive/llgltfmaterial.cpp @@ -241,6 +241,7 @@ void LLGLTFMaterial::writeToModel(tinygltf::Model& model, S32 mat_index) const material_out.alphaCutoff = mAlphaCutoff; mBaseColor.write(material_out.pbrMetallicRoughness.baseColorFactor); + material_out.emissiveFactor.resize(3); // 0 size by default mEmissiveColor.write(material_out.emissiveFactor); material_out.pbrMetallicRoughness.metallicFactor = mMetallicFactor; @@ -477,6 +478,7 @@ void LLGLTFMaterial::writeOverridesToModel(tinygltf::Model& model, S32 mat_index if (mEmissiveColor != base_material->mEmissiveColor) { + material_out.emissiveFactor.resize(3); // 0 size by default mEmissiveColor.write(material_out.emissiveFactor); } |