projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datamap object passed around while loading
[laserbrain_demo]
/
src
/
sceneload.cc
diff --git
a/src/sceneload.cc
b/src/sceneload.cc
index
7e9cade
..
ad6e61e
100644
(file)
--- 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);
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);
assert(tex);
mat->textures.push_back(tex);