From: Mikko Rasa Date: Sun, 7 Nov 2021 08:36:42 +0000 (+0200) Subject: Remove the deprecated srgb_conversion flag from Resources X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=f64d903f902ad72596284e9fbd17ad06262b2fc9;p=libs%2Fgl.git Remove the deprecated srgb_conversion flag from Resources By now it didn't even have any effect anymore --- diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp index 7cbdd2c5..e67405ac 100644 --- a/source/resources/resources.cpp +++ b/source/resources/resources.cpp @@ -43,7 +43,6 @@ void init_builtin_data(DataFile::BuiltinSource &); Resources *Resources::global_resources = 0; Resources::Resources(bool set_as_global): - srgb_conversion(false), resource_manager(0) { add_type().suffix(".anim").keyword("animation"); @@ -140,11 +139,6 @@ const DataFile::CollectionSource &Resources::get_builtins() return builtins; } -void Resources::set_srgb_conversion(bool c) -{ - srgb_conversion = c; -} - void Resources::set_resource_manager(ResourceManager *m) { resource_manager = m; diff --git a/source/resources/resources.h b/source/resources/resources.h index 589ea5ae..0743f763 100644 --- a/source/resources/resources.h +++ b/source/resources/resources.h @@ -82,7 +82,6 @@ private: virtual void type(const DataFile::Symbol &); }; - bool srgb_conversion; ResourceManager *resource_manager; static Resources *global_resources; @@ -94,12 +93,6 @@ public: static Resources &get_global(); static const DataFile::CollectionSource &get_builtins(); - /** Enables or disables sRGB conversion. If enabled, textures and material - colors are converted from sRGB to linear color space when loaded. */ - DEPRECATED void set_srgb_conversion(bool); - - DEPRECATED bool get_srgb_conversion() const { return srgb_conversion; } - void set_resource_manager(ResourceManager *); protected: