From fc0116b323755db8fceb640109083a5330217e20 Mon Sep 17 00:00:00 2001 From: kroko Date: Sun, 3 Mar 2019 08:28:49 +0200 Subject: [PATCH] rename TINYGLTF_BYPASS_INCLUDE_x to TINYGLTF_NO_INCLUDE_x --- README.md | 6 +++--- tiny_gltf.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 31a0982..62986ea 100644 --- a/README.md +++ b/README.md @@ -134,9 +134,9 @@ if (!ret) { * `TINYGLTF_NO_EXTERNAL_IMAGE` : Do not try to load external image file. This option woulde be helpful if you do not want load image file during glTF parsing. * `TINYGLTF_ANDROID_LOAD_FROM_ASSETS`: Load all files from packaged app assets instead of the regular file system. **Note:** You must pass a valid asset manager from your android app to `tinygltf::asset_manager` beforehand. * `TINYGLTF_ENABLE_DRACO`: Enable Draco compression. User must provide include path and link correspnding libraries in your project file. -* `TINYGLTF_BYPASS_INCLUDE_JSON `: Disable including `json.hpp` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`. -* `TINYGLTF_BYPASS_INCLUDE_STB_IMAGE `: Disable including `stb_image.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`. -* `TINYGLTF_BYPASS_INCLUDE_STB_IMAGE_WRITE `: Disable including `stb_image_write.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`. +* `TINYGLTF_NO_INCLUDE_JSON `: Disable including `json.hpp` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`. +* `TINYGLTF_NO_INCLUDE_STB_IMAGE `: Disable including `stb_image.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`. +* `TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE `: Disable including `stb_image_write.h` from within `tiny_gltf.h` because it has been already included before or you want to include it using custom path before including `tiny_gltf.h`. ### Saving gltTF 2.0 model diff --git a/tiny_gltf.h b/tiny_gltf.h index 5f8d328..76efa16 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -1077,7 +1077,7 @@ class TinyGLTF { #endif #endif -#ifndef TINYGLTF_BYPASS_INCLUDE_JSON +#ifndef TINYGLTF_NO_INCLUDE_JSON #include "json.hpp" #endif @@ -1087,13 +1087,13 @@ class TinyGLTF { #endif #ifndef TINYGLTF_NO_STB_IMAGE -#ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE +#ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE #include "stb_image.h" #endif #endif #ifndef TINYGLTF_NO_STB_IMAGE_WRITE -#ifndef TINYGLTF_BYPASS_INCLUDE_STB_IMAGE +#ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE #include "stb_image_write.h" #endif #endif