Merge upstream master
authorjohnmaf <johns@matterandform.net>
Tue, 20 Sep 2016 15:53:12 +0000 (11:53 -0400)
committerjohnmaf <johns@matterandform.net>
Tue, 20 Sep 2016 15:53:12 +0000 (11:53 -0400)
commitc9f28192d9f2715c5a02dfbf8ed84b1dba6939b9
treea0827e824b98652301a100d88e59a473f8b5b654
parent3c827f29f652f102dc620d3c4f283db4d38cec4b
parentc11ae8e72240f79b6014cda69b12ace23487ad17
Merge upstream master
code/glTFAsset.h
code/glTFAssetWriter.inl
code/glTFExporter.cpp