v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preproc conditional should be &&, not ||

pull/3328/head
awr1 2020-07-14 21:50:22 -05:00
parent bad0df9a1a
commit cc8cd88d7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/glTF/glTFExporter.cpp
View File

@ -525,7 +525,7 @@ void ExportSkin(Asset& mAsset, const aiMesh* aimesh, Ref<Mesh>& meshRef, Ref<Buf
delete[] vertexJointData; 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" #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif #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 #pragma GCC diagnostic pop
#endif #endif