X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fsceneload.cc;h=ad6e61ec5b625c9a469bf545f25dbc4c7c48208b;hp=7e9cade352639e26088c77a7132215bbbcdc7d5e;hb=b30241a8a51be904b22459a1d0cc3322e0a505d9;hpb=21f74bf587d9b7a76bc1ee83db02cb8c243dc567 diff --git a/src/sceneload.cc b/src/sceneload.cc index 7e9cade..ad6e61e 100644 --- a/src/sceneload.cc +++ b/src/sceneload.cc @@ -202,7 +202,7 @@ static bool load_material(Scene *scn, Material *mat, const aiMaterial *aimat) int textype = assimp_textype(aitype); info_log("loading %s texture: %s\n", assimp_textypestr(aitype), fname); - Texture *tex = scn->texset->get_texture(fname, TEX_2D); + Texture *tex = scn->texset->get_texture(fname, TEX_2D, &scn->datamap); assert(tex); mat->textures.push_back(tex);