diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-14 17:35:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-14 17:35:48 -0500 |
| commit | f6762c3de57434730a2cbf6d0241bf1db5c9346c (patch) | |
| tree | 4a112b3ce07552bc19e1c8b4474b64c292572d1f /indra/newview/lllocalgltfmaterials.cpp | |
| parent | a2b09df2db69ba8a2e6b587d839d509fbe5abebb (diff) | |
SL-18105 Add to/from json capability to LLGLTFMaterial
Diffstat (limited to 'indra/newview/lllocalgltfmaterials.cpp')
| -rw-r--r-- | indra/newview/lllocalgltfmaterials.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp index 1f16549a47..fe2b7ac816 100644 --- a/indra/newview/lllocalgltfmaterials.cpp +++ b/indra/newview/lllocalgltfmaterials.cpp @@ -270,7 +270,7 @@ bool LLLocalGLTFMaterial::loadMaterial(LLPointer<LLGLTFMaterial> mat, S32 index) } // sets everything, but textures will have inaccurate ids - LLTinyGLTFHelper::setFromModel(mat, model_in, index); + mat->setFromModel(model_in, index); std::string folder = gDirUtilp->getDirName(filename_lc); tinygltf::Material material_in = model_in.materials[index]; |