From 496a8de5147b79c47b4e6412794e6437a2b31e33 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 12 Aug 2009 12:57:25 +0000 Subject: corrected a stupid bug that prevented materials from obtaining texture sizes --- src/render/textures.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/render/textures.cc') 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]); -- cgit v1.2.3