Rename some Loader methods to avoid having to static_cast the pointers

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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index b67be7170ae7cff929d24b115552cce009db05e6..8c4048ca6e9887e993b0c689c63d257092103a7a 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -74,8 +74,8 @@ void RenderPass::Loader::init()
        allow_pointer_reload = false;
 
        add("shader",   &RenderPass::shprog);
-       add("material", static_cast<void (Loader::*)()>(&Loader::material));
-       add("material", static_cast<void (Loader::*)(const string &)>(&Loader::material));
+       add("material", &Loader::material_inline);
+       add("material", &Loader::material);
        add("texunit",  &Loader::texunit);
        add("uniforms", &Loader::uniforms);
 }
@@ -87,7 +87,7 @@ void RenderPass::Loader::finish()
                obj.shdata = new ProgramData;
 }
 
-void RenderPass::Loader::material()
+void RenderPass::Loader::material_inline()
 {
        RefPtr<Material> mat = new Material;
        load_sub(*mat);