assimp/assimp — pull request #208 by NickNick (2013-12-11 11:53:15+00:00)
Title: Add support for emissive and gloss-maps

Adds support for loading emmissive/glow-maps to the wavefront loader

Conflicts:
code/ObjFileMtlImporter.cpp
Someone added support for loading more bump maps, I added support for emmissive-maps. Easy merge.