From cc8cd88d7adbeefb658fa8f48714353cbc1f3e89 Mon Sep 17 00:00:00 2001
From: awr1 <41453959+awr1@users.noreply.github.com>
Date: Tue, 14 Jul 2020 21:50:22 -0500
Subject: [PATCH] Preproc conditional should be &&, not ||

---
 code/AssetLib/glTF/glTFExporter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/AssetLib/glTF/glTFExporter.cpp b/code/AssetLib/glTF/glTFExporter.cpp
index 44a37af49..032555fc3 100644
--- a/code/AssetLib/glTF/glTFExporter.cpp
+++ b/code/AssetLib/glTF/glTFExporter.cpp
@@ -525,7 +525,7 @@ void ExportSkin(Asset& mAsset, const aiMesh* aimesh, Ref<Mesh>& meshRef, Ref<Buf
     delete[] vertexJointData;
 }
 
-#if defined(__has_warning) || __has_warning("-Wunused-but-set-variable")
+#if defined(__has_warning) && __has_warning("-Wunused-but-set-variable")
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
@@ -797,7 +797,7 @@ void glTFExporter::ExportMeshes()
     }
 }
 
-#if defined(__has_warning) || __has_warning("-Wunused-but-set-variable")
+#if defined(__has_warning) && __has_warning("-Wunused-but-set-variable")
 #pragma GCC diagnostic pop
 #endif