diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-02-14 11:40:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 11:40:32 -0800 |
| commit | ba7a3339697a906119520e23064dac2d7a5f31ff (patch) | |
| tree | 0cf27027eb36956c6a0e39102ea42588c127bcdd /indra/newview/llgltfmateriallist.cpp | |
| parent | 1b19b7cdc9e3d7560c3bd952d81076aee5ae13c2 (diff) | |
| parent | d2a2541de598f8d85dba28e88f0b44ccdcdd6ba6 (diff) | |
Merge pull request #73 from secondlife/SL-19080
SL-19080: GLTF Material asset consistency: Part 2: Update viewer GLTF Material asset upload to v1.1
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 bc094ac838..4051521ad4 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -564,9 +564,9 @@ void LLGLTFMaterialList::onAssetLoadComplete(const LLUUID& id, LLAssetType::ETyp if (LLSDSerialize::deserialize(asset, str, buffer.size())) { - if (asset.has("version") && asset["version"] == "1.0") + if (asset.has("version") && LLGLTFMaterial::isAcceptedVersion(asset["version"].asString())) { - if (asset.has("type") && asset["type"].asString() == "GLTF 2.0") + if (asset.has("type") && asset["type"].asString() == LLGLTFMaterial::ASSET_TYPE) { if (asset.has("data") && asset["data"].isString()) { |