Merge branch 'master' of https://github.com/bkaradzic/bgfx

# Conflicts: # src/renderer_d3d11.cpp
BabylonJS · Apr 9, 2020 · af53534 · af53534
2 parents b3ec1c8 + 93f1d78
commit af53534
Show file tree

Hide file tree

Showing 5,839 changed files with 43,444 additions and 908,387 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,11 +1,12 @@
 shallow_clone: true
 
 os:
-  - Visual Studio 2017
+  - Visual Studio 2019
 
 environment:
   matrix:
   - TOOLSET: vs2017
+  - TOOLSET: vs2019
 
 configuration:
   - Debug

diff --git a/3rdparty/cgltf/.travis.yml b/3rdparty/cgltf/.travis.yml
diff --git a/3rdparty/cgltf/README.md b/3rdparty/cgltf/README.md