X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=ac014a00147bda31eef70d842c644cab3d27929d;hp=7dbb501c777bd177b53e9ba37229913e5f07fd92;hb=cd01b904990d306eadd120f306b1d0ceb4d8f5c8;hpb=78f43047696fbb629e4bc9cfb1068e3fef77cb0a diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index 7dbb501c..ac014a00 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -174,7 +174,10 @@ void Compiler::append_module(Module &mod, DataFile::Collection *res) { module->source_map.merge_from(mod.source_map); - vector imports = NodeGatherer().apply(mod.shared); + vector imports; + for(NodeList::const_iterator i=mod.shared.content.body.begin(); i!=mod.shared.content.body.end(); ++i) + if(Import *imp = dynamic_cast(i->get())) + imports.push_back(imp); for(vector::iterator i=imports.begin(); i!=imports.end(); ++i) import(res, (*i)->module); NodeRemover().apply(mod.shared, set(imports.begin(), imports.end()));