Merge branch 'develop' of github.com:syoyo/tinyobjloader into develop

2016-05-25 19:06:42 +09:00
parent de79540879 8880438c36
commit 2c7ba7b2ab
2 changed files with 64 additions and 21 deletions
--- a/experimental/viewer.cc
+++ b/experimental/viewer.cc
@@ -183,7 +183,7 @@ bool gz_load(std::vector<char>* buf, const char* filename)
 const char* get_file_data(size_t *len, const char* filename)
 {

-  char *ext = strrchr(filename, '.');
+  const char *ext = strrchr(filename, '.');

  size_t data_len = 0;
  const char* data = nullptr;