Merge branch 'tigrazone' into devel

2017-12-13 18:37:37 +09:00
parent 7b6e33da52 160d6be10f
commit cc73127bf0
3 changed files with 1126 additions and 607 deletions
--- a/loader_example.cc
+++ b/loader_example.cc
@@ -361,7 +361,7 @@ static bool TestStreamLoadObj() {
    virtual ~MaterialStringStreamReader() {}
    virtual bool operator()(const std::string& matId,
                            std::vector<material_t>* materials,
-                            std::map<std::string, int>* matMap,
+                            std::map<unsigned int, int>* matMap,
                            std::string* err) {
      (void)matId;
      std::string warning;