X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=85f5fb5836ebdcdb56af17191343a9c2f21be9ea;hp=4968e2e678bd6103c239103828cc1c78b0ff4b2b;hb=f19366d32cc29287a2730cfba90893e407754081;hpb=f96d553dbf78f9d664d1dbb1fe002fc43f23ad47 diff --git a/source/core/texture.cpp b/source/core/texture.cpp index 4968e2e6..85f5fb58 100644 --- a/source/core/texture.cpp +++ b/source/core/texture.cpp @@ -65,22 +65,10 @@ void Texture::load_image(const string &fn, unsigned lv) } -Texture::Loader::Loader(Texture &t): - DataFile::CollectionObjectLoader(t, 0) +Texture::Loader::Loader(Texture &t, Collection *c): + CollectionObjectLoader(t, c), + levels(0) { - init(); -} - -Texture::Loader::Loader(Texture &t, Collection &c): - DataFile::CollectionObjectLoader(t, &c) -{ - init(); -} - -void Texture::Loader::init() -{ - levels = 0; - add("external_image", &Loader::external_image); add("external_image_srgb", &Loader::external_image_srgb); add("generate_mipmap", &Loader::generate_mipmap);