diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-05-11 21:21:01 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-05-11 21:21:01 -0700 |
| commit | ad4118f6ceaf1c22b22d58825924aad5575319f9 (patch) | |
| tree | a1227572853491f2e89fb0db128230c40248b47d /indra/llprimitive/llgltfmaterial.h | |
| parent | 339e02ef3311ad5c1197dfca2955a0c202b7c408 (diff) | |
| parent | 06bdee663433bf5b12eddcbcfcb8785546354c28 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.h')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index 0bd65fadef..ad7784f6d1 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -167,6 +167,7 @@ public: // set the contents of this LLGLTFMaterial from the given json // returns true if successful + // if unsuccessful, the contents of this LLGLTFMaterial should be left unchanged and false is returned // json - the json text to load from // warn_msg - warning message from TinyGLTF if any // error_msg - error_msg from TinyGLTF if any |