From 6a0d4c57b1a9926343cdded6ec6f69ac06e8fca4 Mon Sep 17 00:00:00 2001 From: kroko Date: Sun, 3 Mar 2019 01:28:45 +0200 Subject: [PATCH] Fix for when json and stb is aready used in project v2 --- tiny_gltf.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index e2eb2ff..5f8d328 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -1087,20 +1087,16 @@ class TinyGLTF { #endif #ifndef TINYGLTF_NO_STB_IMAGE -#ifndef STB_IMAGE_IMPLEMENTATION #ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE #include "stb_image.h" #endif #endif -#endif #ifndef TINYGLTF_NO_STB_IMAGE_WRITE -#ifndef STB_IMAGE_WRITE_IMPLEMENTATION #ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE #include "stb_image_write.h" #endif #endif -#endif #ifdef __clang__ #pragma clang diagnostic pop