From 68a04a06c6eb40ec754a12e7815e719cefb4b2b5 Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Tue, 7 Mar 2023 18:46:11 -0500 Subject: [PATCH] Use the modernjson package from the viewer in tinygltf --- indra/llprimitive/llgltfloader.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp index fd304f7bc96..63aa7c4bb3f 100644 --- a/indra/llprimitive/llgltfloader.cpp +++ b/indra/llprimitive/llgltfloader.cpp @@ -43,6 +43,13 @@ // Additionally, disable inclusion of STB header files entirely with // TINYGLTF_NO_INCLUDE_STB_IMAGE // TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE + +#include <nlohmann/json.hpp> + +#ifndef TINYGLTF_NO_INCLUDE_JSON +#define TINYGLTF_NO_INCLUDE_JSON 1 +#endif + #include "tinygltf/tiny_gltf.h" -- GitLab