X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=78053386a1e15e80ca2414d1d6261e19e4ac73ca;hb=a7948dfc4192efbbf2b5ca9258fd7e72b971f8ea;hp=54577aacd55e06f389361f0eda96305b42a63057;hpb=5f5331a2d4c77c3954be1be65daa407d5841f8fc;p=libs%2Fgl.git

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index 54577aac..78053386 100644
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -87,8 +87,8 @@ Texture::Loader::Loader(Texture &t, Collection *c):
 	CollectionObjectLoader<Texture>(t, c),
 	levels(0)
 {
-	add("external_image", &Loader::external_image);
-	add("external_image_srgb", &Loader::external_image_srgb);
+	add("external_image", &Loader::external_image, false);
+	add("external_image_srgb", &Loader::external_image, true);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("image_data", &Loader::image_data);
 	add("mipmap_levels", &Loader::mipmap_levels);
@@ -108,20 +108,9 @@ void Texture::Loader::load_external_image(Graphics::Image &img, const string &fn
 	img.load_io(*io);
 }
 
-void Texture::Loader::external_image(const string &fn)
-{
-	obj.use_srgb_format = false;
-	external_image_common(fn);
-}
-
-void Texture::Loader::external_image_srgb(const string &fn)
-{
-	obj.use_srgb_format = true;
-	external_image_common(fn);
-}
-
-void Texture::Loader::external_image_common(const string &fn)
+void Texture::Loader::external_image(bool srgb, const string &fn)
 {
+	obj.use_srgb_format = srgb;
 	if(obj.manager)
 		obj.manager->set_resource_location(obj, get_collection(), fn);
 	else