Skip to content

Commit

Permalink
update compute to fix embree msvcrt conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike-Leo-Smith committed Jun 2, 2024
1 parent 0b5544a commit 76324cc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/ext/assimp
Submodule assimp updated 53 files
+1 −1 CMakeLists.txt
+13 −0 code/AssetLib/ASE/ASEParser.cpp
+3 −1 code/AssetLib/Collada/ColladaLoader.cpp
+2 −1 code/AssetLib/Collada/ColladaParser.cpp
+0 −1 code/AssetLib/FBX/FBXParser.h
+0 −1 code/AssetLib/FBX/FBXProperties.cpp
+5 −3 code/AssetLib/Obj/ObjFileParser.cpp
+4 −0 code/AssetLib/Q3D/Q3DLoader.cpp
+2 −2 code/AssetLib/glTF2/glTF2Importer.cpp
+16 −0 code/CMakeLists.txt
+7 −2 code/Common/Assimp.cpp
+4 −2 code/Common/Bitmap.cpp
+5 −1 code/Common/Subdivision.cpp
+4 −0 code/Geometry/GeometryUtils.h
+4 −4 code/PostProcessing/CalcTangentsProcess.cpp
+2 −2 code/PostProcessing/TextureTransform.cpp
+19 −17 contrib/draco/BUILDING.md
+1 −0 contrib/zip/.gitattributes
+60 −0 contrib/zip/.gitignore
+0 −18 contrib/zip/.travis.sh
+0 −22 contrib/zip/.travis.yml
+44 −24 contrib/zip/CMakeLists.txt
+9 −0 contrib/zip/CONTRIBUTING.md
+2,480 −0 contrib/zip/Doxyfile.in
+209 −37 contrib/zip/README.md
+0 −14 contrib/zip/appveyor.yml
+4 −0 contrib/zip/cmake/Config.cmake.in
+8,606 −5,230 contrib/zip/src/miniz.h
+574 −241 contrib/zip/src/zip.c
+171 −44 contrib/zip/src/zip.h
+15 −7 contrib/zip/test/CMakeLists.txt
+370 −0 contrib/zip/test/minunit.h
+0 −495 contrib/zip/test/test.c
+104 −0 contrib/zip/test/test_append.c
+438 −0 contrib/zip/test/test_entry.c
+161 −0 contrib/zip/test/test_extract.c
+0 −127 contrib/zip/test/test_miniz.c
+68 −0 contrib/zip/test/test_open.c
+191 −0 contrib/zip/test/test_permissions.c
+146 −0 contrib/zip/test/test_read.c
+113 −0 contrib/zip/test/test_write.c
+1 −0 doc/Fileformats.md
+2 −2 include/assimp/fast_atof.h
+32 −17 include/assimp/material.h
+2 −2 port/PyAssimp/scripts/3d_viewer.py
+9 −0 test/unit/AssimpAPITest.cpp
+3 −3 test/unit/utD3MFImportExport.cpp
+2 −2 test/unit/utVersion.cpp
+28 −11 tools/assimp_view/Display.cpp
+25 −10 tools/assimp_view/MessageProc.cpp
+5 −11 tools/assimp_view/assimp_view.cpp
+4 −0 tools/assimp_view/assimp_view.h
+22 −22 tools/assimp_view/assimp_view.rc
2 changes: 1 addition & 1 deletion src/ext/cxxopts

0 comments on commit 76324cc

Please sign in to comment.