X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fmesh.cpp;h=b5628eb10c860bbc758b17e08b7db045bea7b65c;hp=467f35448382e4d02744cbc3a6ccf36fef657984;hb=5fa69268fa051ce8d74d30bb3d7eecc1b00cff15;hpb=f64d903f902ad72596284e9fbd17ad06262b2fc9 diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp index 467f3544..b5628eb1 100644 --- a/source/core/mesh.cpp +++ b/source/core/mesh.cpp @@ -243,9 +243,8 @@ void Mesh::set_debug_name(const string &name) } -Mesh::Loader::Loader(Mesh &m, bool g): - DataFile::ObjectLoader(m), - allow_gl_calls(g) +Mesh::Loader::Loader(Mesh &m): + DataFile::ObjectLoader(m) { add("batch", &Loader::batch); add("storage", &Loader::storage); @@ -312,7 +311,8 @@ bool Mesh::AsyncLoader::process() { // TODO use correct filename DataFile::Parser parser(io, "async"); - Loader loader(mesh, false); + Loader loader(mesh); + loader.allow_gl_calls = false; loader.load(parser); } else if(phase==1)