Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into msvcfix

Browse Source
This commit is contained in:
Kim Kulling
2022-06-01 17:11:06 +02:00
committed by GitHub
parent 43c767dd62 2e944686f8
commit 03532eaec3
6 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/M3D/M3DWrapper.h
View File

@@ -57,9 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Assimp specific M3D configuration. Comment out these defines to remove functionality
//#define ASSIMP_USE_M3D_READFILECB
// Share stb_image's PNG loader with other importers/exporters instead of bringing our own copy.
#define STBI_ONLY_PNG
#include <stb/stb_image.h>
#include "Common/StbCommon.h"
#include "m3d.h"