Add functions for setting arrays of 2x2 and 3x3 matrix uniforms

[libs/gl.git] / source / resources.cpp

diff --git a/source/resources.cpp b/source/resources.cpp
index fe59860d8cbbcd6ec9017bbdc70d162e8eff669e..22814cb820525809836226b2a455afd844d668cd 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -95,7 +95,7 @@ Mesh *Resources::create_mesh(const string &name)
        if(!resource_manager)
                return 0;
 
-       if(RefPtr<IO::Seekable> io = open_from_sources(name))
+       if(RefPtr<IO::Seekable> io = open_raw(name))
        {
                RefPtr<Mesh> mesh = new Mesh(resource_manager);
                resource_manager->set_resource_location(*mesh, *this, name);
@@ -111,7 +111,7 @@ Texture2D *Resources::create_texture2d(const string &name)
        if(ext==".tex2d")
                return 0;
 
-       if(RefPtr<IO::Seekable> io = open_from_sources(name))
+       if(RefPtr<IO::Seekable> io = open_raw(name))
        {
                Graphics::Image image;
                if(!resource_manager)
@@ -121,7 +121,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 
                if(is_mipmapped(default_tex_filter))
                {
-                       tex->set_generate_mipmap(true);
+                       tex->set_auto_generate_mipmap(true);
                        tex->set_mag_filter(LINEAR);
                }
                else
@@ -145,7 +145,7 @@ Program *Resources::create_program(const string &name)
        if(ext==".shader")
                return 0;
 
-       if(RefPtr<IO::Seekable> io = open_from_sources(name))
+       if(RefPtr<IO::Seekable> io = open_raw(name))
        {
                ProgramCompiler compiler;
                compiler.compile(*io, this, name);