X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Ftext.cpp;fp=source%2Frender%2Ftext.cpp;h=3b2380c4200cf74cd1d4080ddd35b14d76042ca9;hp=210411a5eeedca8f233b92fcf053d0947ff24b66;hb=fa2b4c8a93ebad2497cacfdeaa9a2c20be486520;hpb=20622e74de6753c5e4460a112c11ee913707e8e8 diff --git a/source/render/text.cpp b/source/render/text.cpp index 210411a5..3b2380c4 100644 --- a/source/render/text.cpp +++ b/source/render/text.cpp @@ -28,13 +28,13 @@ void Text::set_technique(const Technique *tech, const string &ts) if(!*tex_slot && tech->has_pass(Tag())) if(const Program *shprog = tech->get_pass(Tag()).get_shader_program()) { - if(shprog->get_uniform_location("font_tex")>=0) + if(shprog->get_uniform_location(Tag("font_tex"))>=0) tex_slot = "font_tex"; - else if(shprog->get_uniform_location("color_tex")>=0) + else if(shprog->get_uniform_location(Tag("color_tex"))>=0) tex_slot = "color_tex"; - else if(shprog->get_uniform_location("diffuse_map")>=0) + else if(shprog->get_uniform_location(Tag("diffuse_map"))>=0) tex_slot = "diffuse_map"; - else if(shprog->get_uniform_location("base_color_map")>=0) + else if(shprog->get_uniform_location(Tag("base_color_map"))>=0) tex_slot = "base_color_map"; }