Merge remote-tracking branch 'origin/devel' into generic_extension_support

# Conflicts:
#	tiny_gltf.h
This commit is contained in:
Selmar Kok
2018-04-04 18:34:30 +02:00
6 changed files with 2226 additions and 106 deletions

View File

@@ -1,5 +1,6 @@
#define TINYGLTF_IMPLEMENTATION
#define STB_IMAGE_IMPLEMENTATION
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "tiny_gltf.h"
#include <cstdio>