X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Ftechnique.cpp;h=e41f0c8ef4919612577fcf34baacced5719044fa;hb=24b24e2203c776aacd9744bb947f5cf47b03d328;hp=ef1764112c4f3de6b98a2310ce67b84267e34e9d;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git diff --git a/source/materials/technique.cpp b/source/materials/technique.cpp index ef176411..e41f0c8e 100644 --- a/source/materials/technique.cpp +++ b/source/materials/technique.cpp @@ -83,7 +83,7 @@ bool Technique::replace_uniforms(const ProgramData &shdata) if(!new_shdata) new_shdata = new ProgramData(*kvp.second.get_shader_data()); - new_shdata->uniform(tag, shdata.get_uniform(t)); + new_shdata->copy_uniform(shdata, tag); replaced = true; } @@ -102,7 +102,7 @@ bool Technique::has_shaders() const return false; } -void Technique::set_debug_name(const std::string &name) +void Technique::set_debug_name(const string &name) { #ifdef DEBUG for(auto &kvp: passes)