X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.cpp;fp=source%2Fmaterials%2Frenderpass.cpp;h=810b3673e584671423c95795a0eaab5cdd9c5e93;hp=5ee50f8a1726b39cf986740db7326c699281f2d6;hb=4c856cc3c0425fef1d123fe846ab19fbb10ab6c6;hpb=68b74ce23dd20822b07d79dc25aa0a0a19ef27a5 diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp index 5ee50f8a..810b3673 100644 --- a/source/materials/renderpass.cpp +++ b/source/materials/renderpass.cpp @@ -117,11 +117,11 @@ const string &RenderPass::get_slotted_uniform_name(const string &slot) const return i->second; } -void RenderPass::set_material(const Material *mat) +void RenderPass::set_material(const Material *mat, DataFile::Collection *coll) { material = mat; material.keep(); - finalize_material(0); + finalize_material(coll); } void RenderPass::set_texture(unsigned index, const Texture *tex, const Sampler *samp)