X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmaterials%2Fpbrmaterial.cpp;h=e01bbb9d5f0043463a6d38a987f04758a2c95022;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hp=ad36159a6b12c744213d51cfa2605385e8e5d048;hpb=6353307898cd397e2bcde13e2448a8a678a60004;p=libs%2Fgl.git diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp index ad36159a..e01bbb9d 100644 --- a/source/materials/pbrmaterial.cpp +++ b/source/materials/pbrmaterial.cpp @@ -36,7 +36,7 @@ const Texture2D &PbrMaterial::get_or_create_fresnel_lookup() { Resources &resources = Resources::get_global(); - static const string name = "_pbr_fresnel_lookup.tex2d"; + static const string name = "_pbr_fresnel_lookup.tex"; Texture2D *fresnel_lookup = resources.find(name); if(fresnel_lookup) return *fresnel_lookup; @@ -160,12 +160,6 @@ void PbrMaterial::set_emission_map(const Texture *tex) DataFile::Loader::ActionMap PbrMaterial::Loader::shared_actions; -PbrMaterial::Loader::Loader(PbrMaterial &m): - DerivedObjectLoader >(m) -{ - set_actions(shared_actions); -} - PbrMaterial::Loader::Loader(PbrMaterial &m, Collection &c): DerivedObjectLoader >(m, c) {