Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix

author Kim Kulling <kimkulling@users.noreply.github.com>

Tue, 19 Sep 2017 13:40:53 +0000 (15:40 +0200)

committer GitHub <noreply@github.com>

Tue, 19 Sep 2017 13:40:53 +0000 (15:40 +0200)
author Kim Kulling <kimkulling@users.noreply.github.com>
Tue, 19 Sep 2017 13:40:53 +0000 (15:40 +0200)
committer GitHub <noreply@github.com>
Tue, 19 Sep 2017 13:40:53 +0000 (15:40 +0200)
diff --cc code/glTF2Exporter.cpp
Simple merge
diff --cc code/glTF2Importer.cpp
Simple merge
author	Kim Kulling <kimkulling@users.noreply.github.com>
	Tue, 19 Sep 2017 13:40:53 +0000 (15:40 +0200)
committer	GitHub <noreply@github.com>
	Tue, 19 Sep 2017 13:40:53 +0000 (15:40 +0200)
		1	2
code/glTF2Exporter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
code/glTF2Importer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history