Merge pull request #10277 from super626/v3

fix bug on loading .mtl
2015-01-29 19:21:31 +08:00 · 2015-01-29 19:21:31 +08:00 · dff7d6f639
parent 0ac7fca9f0 3eeeaf051f
commit dff7d6f639
1 changed files with 1 additions and 1 deletions
--- a/cocos/3d/CCObjLoader.cpp
+++ b/cocos/3d/CCObjLoader.cpp
@ -289,7 +289,7 @@ std::string LoadMtl ( std::map<std::string, ObjLoader::material_t>& material_map
        filepath = std::string(filename);
    }
    
-    std::ifstream ifs(filepath.c_str());
+    std::istringstream ifs(FileUtils::getInstance()->getStringFromFile(filepath));
    if (!ifs) 
    {
        err << "Cannot open file [" << filepath << "]" << std::endl;