Merge branch 'master' into ColladaSubmeshFix

2021-01-24 02:30:31 -08:00 · 2021-01-24 02:30:31 -08:00 · b48e19c28f
parent 338abded12 9dc95be939
commit b48e19c28f
1 changed files with 3 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -18,6 +18,9 @@ build
 *.VC.db-wal
 *.VC.opendb
 *.ipch
+.vs/
+out/
+CMakeSettings.json

 # Output
 bin/