Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
authorAngelo Scandaliato <angelo@adtile.me>
Mon, 3 Oct 2016 16:34:16 +0000 (09:34 -0700)
committerAngelo Scandaliato <angelo@adtile.me>
Mon, 3 Oct 2016 16:34:16 +0000 (09:34 -0700)
commit99c93e861c4e86c7323741888a337e029734749c
treef77ed39b98aa351df5bc111562df542c32aa29b6
parentc1c0808483c87fb8f55eeb762b67304451228d0f
parent27fd350b689f954c9b9321af80c2a6574edad2cd
Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
code/glTFAsset.inl
code/glTFAssetWriter.inl
code/glTFExporter.cpp