X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpbrmaterial.cpp;h=bc7104cc652d485350614b5737b32e6a42771f80;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=8406d4e253e41492afcbd8a0bcda92a830c9e31c;hpb=fde970652beb2832d1fbdad7bde9172454c65eb9;p=libs%2Fgl.git diff --git a/source/pbrmaterial.cpp b/source/pbrmaterial.cpp index 8406d4e2..bc7104cc 100644 --- a/source/pbrmaterial.cpp +++ b/source/pbrmaterial.cpp @@ -111,19 +111,20 @@ void PbrMaterial::set_receive_shadows(bool s) DataFile::Loader::ActionMap PbrMaterial::Loader::shared_actions; PbrMaterial::Loader::Loader(PbrMaterial &m): - DerivedObjectLoader >(m) + DerivedObjectLoader >(m) { set_actions(shared_actions); } PbrMaterial::Loader::Loader(PbrMaterial &m, Collection &c): - DerivedObjectLoader >(m, c) + DerivedObjectLoader >(m, c) { set_actions(shared_actions); } void PbrMaterial::Loader::init_actions() { + Material::PropertyLoader::init_actions(); add_property("base_color", &PbrMaterial::set_base_color, &PbrMaterial::set_base_color_map, true); add_property("normal", &PbrMaterial::set_normal_map); add_property("metalness", &PbrMaterial::set_metalness, &PbrMaterial::set_metalness_map);