diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-08-12 12:57:25 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-08-12 12:57:25 +0000 |
| commit | 496a8de5147b79c47b4e6412794e6437a2b31e33 (patch) | |
| tree | 75ec82589c02ffbf259eb2f2836e68b65489bf46 /src | |
| parent | 183f0f0b905715f0d89b38174fdfd44641c1a79c (diff) | |
corrected a stupid bug that prevented materials from obtaining texture sizes
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/textures.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/textures.cc b/src/render/textures.cc index fe85c8d..8d180b7 100644 --- a/src/render/textures.cc +++ b/src/render/textures.cc @@ -274,7 +274,7 @@ size_t Textures::bind(const size_t texture, const bool filter) void Textures::material_loader(model::Material *material) { - if ((material->flags() & model::Material::Texture) & (material->texture().size())) { + if ((material->flags() & model::Material::Texture) && (material->texture().size())) { size_t id = load(material->texture()); material->set_texture_id(id); material->set_size(texture_size[id]); |