X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=d52dbe34fb61c745e74c4cad108cdd0a604990e7;hb=bc1675de82ea5c4a07bea4c5afa9c59c497464d2;hp=8de2529fe94c861c771e25fc4121de7778890121;hpb=d0a888978ab0c2226ed5961c736c7cac551e79b1;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 8de2529f..d52dbe34 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -15,6 +15,7 @@
 #include "programcompiler.h"
 #include "resourcemanager.h"
 #include "resources.h"
+#include "sampler.h"
 #include "technique.h"
 #include "texture1d.h"
 #include "texture2d.h"
@@ -46,6 +47,7 @@ Resources::Resources():
 	add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
 	add_type<Pose>().keyword("pose");
 	add_type<Program>().keyword("shader").suffix(".glsl").creator(&Resources::create_program);
+	add_type<Sampler>().suffix(".samp").keyword("sampler");
 	add_type<Technique>().suffix(".tech").keyword("technique");
 	add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d");
 	add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d").creator(&Resources::create_texture2d);
@@ -155,7 +157,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 		if(resource_manager)
 			resource_manager->set_resource_location(*tex, *this, name);
 		else
-			tex->image(image, srgb_conversion);
+			tex->image(image);
 		return tex.release();
 	}