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