X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbasicmaterial.cpp;h=362fc9db14e6a8636960bec3a746cd8e62715ed8;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=9c7714dc1861d1974adc4d20fac8aa9b565d3a37;hpb=41391cd21cf35e979c1d2c88019b7425123500be;p=libs%2Fgl.git

diff --git a/source/basicmaterial.cpp b/source/basicmaterial.cpp
index 9c7714dc..362fc9db 100644
--- a/source/basicmaterial.cpp
+++ b/source/basicmaterial.cpp
@@ -126,19 +126,20 @@ void BasicMaterial::set_receive_shadows(bool s)
 DataFile::Loader::ActionMap BasicMaterial::Loader::shared_actions;
 
 BasicMaterial::Loader::Loader(BasicMaterial &m):
-	DerivedObjectLoader<BasicMaterial, Material::LoaderBase<BasicMaterial> >(m)
+	DerivedObjectLoader<BasicMaterial, Material::PropertyLoader<BasicMaterial> >(m)
 {
 	set_actions(shared_actions);
 }
 
 BasicMaterial::Loader::Loader(BasicMaterial &m, Collection &c):
-	DerivedObjectLoader<BasicMaterial, Material::LoaderBase<BasicMaterial> >(m, c)
+	DerivedObjectLoader<BasicMaterial, Material::PropertyLoader<BasicMaterial> >(m, c)
 {
 	set_actions(shared_actions);
 }
 
 void BasicMaterial::Loader::init_actions()
 {
+	Material::PropertyLoader<BasicMaterial>::init_actions();
 	add_property("diffuse", &BasicMaterial::set_diffuse, &BasicMaterial::set_diffuse_map, true);
 	add_property("specular", &BasicMaterial::set_specular, &BasicMaterial::set_specular_map, false);
 	add_property("normal", &BasicMaterial::set_normal_map);