material editing in scene metafile

[laserbrain_demo] / src / sceneload.cc

diff --git a/src/sceneload.cc b/src/sceneload.cc
index b491cf0..6e959b2 100644 (file)
--- 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);