From a6423bf1a4d7112ab547ae4adc68434cb1bc5bad Mon Sep 17 00:00:00 2001 From: Anish Bhobe Date: Fri, 26 Jul 2024 00:34:27 +0200 Subject: [PATCH] Resolve Macro clash. --- samples/03_model_render/model_loader.cpp | 6 ++++++ samples/03_model_render/model_loader.h | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/samples/03_model_render/model_loader.cpp b/samples/03_model_render/model_loader.cpp index 566d6d9..852385a 100644 --- a/samples/03_model_render/model_loader.cpp +++ b/samples/03_model_render/model_loader.cpp @@ -22,6 +22,12 @@ #include #include +#include + +#if defined(LoadImage) +#undef LoadImage +#endif + vec4 VectorToVec4(const std::vector &vec) { diff --git a/samples/03_model_render/model_loader.h b/samples/03_model_render/model_loader.h index dfa6521..bf9f8ec 100644 --- a/samples/03_model_render/model_loader.h +++ b/samples/03_model_render/model_loader.h @@ -11,7 +11,10 @@ #include "gpu_resource_manager.h" #include "nodes.h" -#include +namespace tinygltf +{ +struct Image; +} struct TextureHandle; struct Texture;