X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fsceneload.cc;h=28f58778796cccc79f7a3079af8ddd8f1fc5a595;hp=1996663e336d3dd16b83e9fdbf6c9da9a5ab3d20;hb=9480e20f4de41693ebd1f22e63d3bcecde878f70;hpb=9fa5be20a9d53becf1f364cb5e6e277ecb74b875 diff --git a/src/sceneload.cc b/src/sceneload.cc index 1996663..28f5877 100644 --- a/src/sceneload.cc +++ b/src/sceneload.cc @@ -68,6 +68,9 @@ bool Scene::load(const char *fname, unsigned int flags) } info_log("Loading scene file: %s\n", fname); + if(this->name.empty()) { + this->name = std::string(fname); + } const aiScene *aiscn = aiImportFile(fname, ppflags); if(!aiscn) { @@ -332,7 +335,7 @@ static int assimp_textype(aiTextureType type) case aiTextureType_EMISSIVE: return MTL_TEX_LIGHTMAP; case aiTextureType_REFLECTION: - return MTL_TEX_ENVMAP; + return MTL_TEX_REFLECT; default: break; }