Merge pull request #1064 from snowzurfer/master
authorKim Kulling <kimkulling@users.noreply.github.com>
Mon, 14 Nov 2016 19:17:28 +0000 (20:17 +0100)
committerGitHub <noreply@github.com>
Mon, 14 Nov 2016 19:17:28 +0000 (20:17 +0100)
Fix obj .mtl file loading


Trivial merge