X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.cpp;h=7431a4461d9977fe6ef601019a12a5705bc63d98;hb=3af09f06e9f69532e5adfe6bcd9a7b2d1aea6d5b;hp=810b3673e584671423c95795a0eaab5cdd9c5e93;hpb=4c856cc3c0425fef1d123fe846ab19fbb10ab6c6;p=libs%2Fgl.git diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp index 810b3673..7431a446 100644 --- a/source/materials/renderpass.cpp +++ b/source/materials/renderpass.cpp @@ -106,14 +106,11 @@ void RenderPass::set_shader_program(const Program *prog, const ProgramData *data finalize_material(0); } -const string &RenderPass::get_slotted_uniform_name(const string &slot) const +Tag RenderPass::get_slotted_uniform_tag(Tag slot) const { - map::const_iterator i = uniform_slots.find(slot); + map::const_iterator i = uniform_slots.find(slot); if(i==uniform_slots.end()) - { - static string empty; - return empty; - } + return Tag(); return i->second; }