X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fsceneload.cc;h=6e959b22e4870b8dd2945edd0d237aa073123c7d;hp=b491cf0c3129b8f16200f649b61698a3c14e692c;hb=d4d7f73284783d2a50d71014789d196bef7d0e0e;hpb=e8fe498f52ff5f3c87759623ce94726af0ef2890 diff --git a/src/sceneload.cc b/src/sceneload.cc index b491cf0..6e959b2 100644 --- a/src/sceneload.cc +++ b/src/sceneload.cc @@ -157,19 +157,12 @@ static bool load_material(Scene *scn, Material *mat, const aiMaterial *aimat) continue; } - char *fname; - int nsize = datamap_path_size(aipath.data); - if(nsize) { - fname = new char[nsize]; - datamap_lookup(aipath.data, fname, nsize); - } else { - fname = new char[strlen(aipath.data) + 1]; - char *dptr = fname; - char *sptr = aipath.data; - do { - *dptr++ = *sptr == '\\' ? '/' : *sptr; - } while(*sptr++); - } + char *fname = (char*)alloca(strlen(aipath.data) + 1); + char *dptr = fname; + char *sptr = aipath.data; + do { + *dptr++ = *sptr == '\\' ? '/' : *sptr; + } while(*sptr++); int textype = assimp_textype(aitype); info_log("loading %s texture: %s\n", assimp_textypestr(aitype), fname);