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/llviewermenufile.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/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 84b0010545..9743f00ab8 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -543,19 +543,19 @@ bool get_bulk_upload_expected_cost(const std::vector<std::string>& filenames, S3 // Todo: make it account for possibility of same texture in different // materials and even in scope of same material S32 texture_count = 0; - if (material->mBaseColorId.notNull()) + if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_BASE_COLOR].notNull()) { texture_count++; } - if (material->mMetallicRoughnessId.notNull()) + if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_METALLIC_ROUGHNESS].notNull()) { texture_count++; } - if (material->mNormalId.notNull()) + if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_NORMAL].notNull()) { texture_count++; } - if (material->mEmissiveId.notNull()) + if (material->mTextureId[LLGLTFMaterial::GLTF_TEXTURE_INFO_EMISSIVE].notNull()) { texture_count++; } |