VPS
Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 925 vs 926 for /trunk/Source Code/Geometry/Material/Headers/Material.inl

Diff revisions: vs.
  @@ -200,9 +200,9 @@
200 200
201 201 /// Add a texture <-> bind slot pair to be bound with the default textures
202 202 /// on each "bindTexture" call
203 - inline void Material::addCustomTexture(const Texture_ptr& texture, U8 offset) {
203 + inline void Material::addExternalTexture(const Texture_ptr& texture, U8 slot, bool activeForDepth) {
204 204 // custom textures are not material dependencies!
205 - _customTextures.push_back(std::make_pair(texture, offset));
205 + _externalTextures.push_back(ExternalTexture { texture, slot, activeForDepth });
206 206 }
207 207
208 208 inline std::weak_ptr<Texture> Material::getTexture(ShaderProgram::TextureUsage textureUsage) const {