X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.cpp;h=d03a72a53eaca89a5debb1ccace6a6054c80e504;hp=2d7e448788e0d81612bb191c7b4733b793e2c6c1;hb=e9a898f;hpb=bdef3de6559629f25121de2e014383d7f773266b diff --git a/source/materials/material.cpp b/source/materials/material.cpp index 2d7e4487..d03a72a5 100644 --- a/source/materials/material.cpp +++ b/source/materials/material.cpp @@ -18,12 +18,12 @@ const Program *Material::create_compatible_shader(const map &extra_ map spec_values; fill_program_info(module_name, spec_values); - for(map::const_iterator i=extra_spec.begin(); i!=extra_spec.end(); ++i) - spec_values[i->first] = i->second; + for(const auto &kvp: extra_spec) + spec_values[kvp.first] = kvp.second; string info = module_name; - for(map::const_iterator i=spec_values.begin(); i!=spec_values.end(); ++i) - info += format(",%s:%d", i->first, i->second); + for(const auto &kvp: spec_values) + info += format(",%s:%d", kvp.first, kvp.second); Resources &res = Resources::get_global(); string name = format("_material_%016x.shader", hash64(info));