diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-01-24 10:14:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 10:14:59 -0800 |
| commit | c22aefafb3d05be37965361913c02568fa10adf6 (patch) | |
| tree | 575757798bdf15d9c58e8e17e5f170de2e074b7a /indra/newview/llgltfmateriallist.cpp | |
| parent | 2adecc6fac9852974e44e3d58ccf2619b45642a9 (diff) | |
| parent | 7b0372ac1f6191ef9216296cef2f476caadee40c (diff) | |
Merge pull request #657 from secondlife/DRTVWR-592
Merge PBR terrain and put PBR terrain behind feature flag.
Diffstat (limited to 'indra/newview/llgltfmateriallist.cpp')
| -rw-r--r-- | indra/newview/llgltfmateriallist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index 92c58a2dbc..a9216ae656 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -471,7 +471,7 @@ void LLGLTFMaterialList::onAssetLoadComplete(const LLUUID& id, LLAssetType::ETyp if (status != LL_ERR_NOERR) { LL_WARNS("GLTF") << "Error getting material asset data: " << LLAssetStorage::getErrorString(status) << " (" << status << ")" << LL_ENDL; - asset_data->mMaterial->materialComplete(); + asset_data->mMaterial->materialComplete(false); delete asset_data; } else @@ -556,7 +556,7 @@ void LLGLTFMaterialList::onAssetLoadComplete(const LLUUID& id, LLAssetType::ETyp LL_DEBUGS("GLTF") << "Failed to get material " << id << LL_ENDL; } - asset_data->mMaterial->materialComplete(); + asset_data->mMaterial->materialComplete(true); delete asset_data; }); |