diff --git a/src/Magnum/DebugTools/TextureImage.cpp b/src/Magnum/DebugTools/TextureImage.cpp index b98f34654..7007cc005 100644 --- a/src/Magnum/DebugTools/TextureImage.cpp +++ b/src/Magnum/DebugTools/TextureImage.cpp @@ -81,9 +81,7 @@ class FloatReinterpretShader: public GL::AbstractShaderProgram { FloatReinterpretShader::FloatReinterpretShader() { #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumDebugTools"_s)) - importDebugToolsResources(); + importDebugToolsResources(); #endif Utility::Resource rs{"MagnumDebugTools"}; diff --git a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp index 8408ecd89..a053450e0 100644 --- a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp +++ b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp @@ -117,9 +117,7 @@ template typename DistanceFieldVectorGL::Com #endif #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumShadersGL"_s)) - importShaderResources(); + importShaderResources(); #endif Utility::Resource rs("MagnumShadersGL"_s); diff --git a/src/Magnum/Shaders/FlatGL.cpp b/src/Magnum/Shaders/FlatGL.cpp index 689659202..3ed52fa0a 100644 --- a/src/Magnum/Shaders/FlatGL.cpp +++ b/src/Magnum/Shaders/FlatGL.cpp @@ -155,9 +155,7 @@ template typename FlatGL::CompileState FlatG #endif #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumShadersGL"_s)) - importShaderResources(); + importShaderResources(); #endif Utility::Resource rs("MagnumShadersGL"_s); diff --git a/src/Magnum/Shaders/LineGL.cpp b/src/Magnum/Shaders/LineGL.cpp index 9bbf9e572..40a320afe 100644 --- a/src/Magnum/Shaders/LineGL.cpp +++ b/src/Magnum/Shaders/LineGL.cpp @@ -108,9 +108,7 @@ template typename LineGL::CompileState LineG } #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumShadersGL"_s)) - importShaderResources(); + importShaderResources(); #endif Utility::Resource rs{"MagnumShadersGL"_s}; diff --git a/src/Magnum/Shaders/MeshVisualizerGL.cpp b/src/Magnum/Shaders/MeshVisualizerGL.cpp index 1cd233b36..82d917947 100644 --- a/src/Magnum/Shaders/MeshVisualizerGL.cpp +++ b/src/Magnum/Shaders/MeshVisualizerGL.cpp @@ -160,9 +160,7 @@ void MeshVisualizerGLBase::assertExtensions(const FlagsBase flags) { #endif #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumShadersGL"_s)) - importShaderResources(); + importShaderResources(); #endif } diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp index 6d920a12a..3220c890c 100644 --- a/src/Magnum/Shaders/PhongGL.cpp +++ b/src/Magnum/Shaders/PhongGL.cpp @@ -173,9 +173,7 @@ PhongGL::CompileState PhongGL::compile(const Configuration& configuration) { #endif #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumShadersGL"_s)) - importShaderResources(); + importShaderResources(); #endif Utility::Resource rs("MagnumShadersGL"_s); diff --git a/src/Magnum/Shaders/VectorGL.cpp b/src/Magnum/Shaders/VectorGL.cpp index 4b576ac29..923b7fd80 100644 --- a/src/Magnum/Shaders/VectorGL.cpp +++ b/src/Magnum/Shaders/VectorGL.cpp @@ -117,9 +117,7 @@ template typename VectorGL::CompileState Vec #endif #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumShadersGL"_s)) - importShaderResources(); + importShaderResources(); #endif Utility::Resource rs("MagnumShadersGL"_s); diff --git a/src/Magnum/Shaders/VertexColorGL.cpp b/src/Magnum/Shaders/VertexColorGL.cpp index f44c96668..cd7930e5f 100644 --- a/src/Magnum/Shaders/VertexColorGL.cpp +++ b/src/Magnum/Shaders/VertexColorGL.cpp @@ -104,9 +104,7 @@ template typename VertexColorGL::CompileStat #endif #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumShadersGL"_s)) - importShaderResources(); + importShaderResources(); #endif Utility::Resource rs("MagnumShadersGL"_s); diff --git a/src/Magnum/TextureTools/DistanceFieldGL.cpp b/src/Magnum/TextureTools/DistanceFieldGL.cpp index 9ad418bb9..bb115677e 100644 --- a/src/Magnum/TextureTools/DistanceFieldGL.cpp +++ b/src/Magnum/TextureTools/DistanceFieldGL.cpp @@ -82,9 +82,7 @@ class DistanceFieldShader: public GL::AbstractShaderProgram { DistanceFieldShader::DistanceFieldShader(const UnsignedInt radius) { #ifdef MAGNUM_BUILD_STATIC - /* Import resources on static build, if not already */ - if(!Utility::Resource::hasGroup("MagnumTextureTools"_s)) - importTextureToolResources(); + importTextureToolResources(); #endif Utility::Resource rs("MagnumTextureTools"_s);