diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-13 17:29:07 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-13 17:29:07 +0300 |
| commit | e316f5cff9611fe7c9d248de93f8584d95c3e0ab (patch) | |
| tree | 3105c292db0427a2d115880d13c4bef67c5fd99b /indra/llprimitive/tests | |
| parent | 9013267da2269a9bd9683862b7449db1b1093afc (diff) | |
| parent | d4043d3b011c32eb503c43c551872f9c24d7344f (diff) | |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/llprimitive/tests')
| -rw-r--r-- | indra/llprimitive/tests/llgltfmaterial_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llgltfmaterial_test.cpp b/indra/llprimitive/tests/llgltfmaterial_test.cpp index 143cf8e9c0..006ab7688d 100644 --- a/indra/llprimitive/tests/llgltfmaterial_test.cpp +++ b/indra/llprimitive/tests/llgltfmaterial_test.cpp @@ -143,7 +143,7 @@ namespace tut #if LL_WINDOWS // If any fields are added/changed, these tests should be updated (consider also updating ASSET_VERSION in LLGLTFMaterial) // This test result will vary between compilers, so only test a single platform - ensure_equals("fields supported for GLTF (sizeof check)", sizeof(LLGLTFMaterial), 216); + ensure_equals("fields supported for GLTF (sizeof check)", sizeof(LLGLTFMaterial), 224); #endif #endif ensure_equals("LLGLTFMaterial texture info count", (U32)LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT, 4); |