diff options
author | Stijn Buys <ingar@osirion.org> | 2013-09-28 12:13:29 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2013-09-28 12:13:29 +0000 |
commit | 18dc1f6d0e044e5e4b1f3a40fcc65e532ec2e765 (patch) | |
tree | 0d6fe9eba4663bdfaa2901b158c5eca554cf1368 /src/render/textures.cc | |
parent | b13e375c130066e2c9d0f34bc79b6b1ad0f0b449 (diff) |
Cleanup of the material API: split flags into flags and colortype.
Diffstat (limited to 'src/render/textures.cc')
-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 e4bfe7f..05c73da 100644 --- a/src/render/textures.cc +++ b/src/render/textures.cc @@ -418,7 +418,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->flag_is_set(model::Material::FlagTexture) && (material->texture().size() > 0)) { size_t id = load(material->texture()); material->set_texture_id(id); material->set_size(texture_size[id]); |