X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fsceneload.cc;h=58d186558c161e332281c0a0f44260a7223d0c3e;hp=e33e4578705bfa1e249a429667759d2c20f32cc8;hb=68e71418a70dab4174981d5a579e96a9089f8682;hpb=c38b9bd9f3b1f4efdb0de5a2aabc3bddf76b6aec

diff --git a/src/sceneload.cc b/src/sceneload.cc
index e33e457..58d1865 100644
--- a/src/sceneload.cc
+++ b/src/sceneload.cc
@@ -200,6 +200,8 @@ static bool load_material(Scene *scn, Material *mat, const aiMaterial *aimat)
 				*dptr++ = *sptr == '\\' ? '/' : *sptr;
 			} while(*sptr++);
 
+			if(!fname || !*fname) continue;
+
 			int textype = assimp_textype(aitype);
 
 			Texture *tex = texman.get_texture(fname, TEX_2D, &scn->datamap);
@@ -377,6 +379,7 @@ Scene *SceneSet::create_scene()
 
 bool SceneSet::load_scene(Scene *scn, const char *fname)
 {
+	scn->clear();
 	return scn->load(fname, SCNLOAD_FLIPTEX | SCNLOAD_STAGE_IO);
 }