diff --git a/src/assets/Assets.cpp b/src/assets/Assets.cpp index c979ca01..c13f3da0 100644 --- a/src/assets/Assets.cpp +++ b/src/assets/Assets.cpp @@ -75,6 +75,7 @@ void Assets::extend(const Assets& assets) { for (auto entry : assets.atlases) { atlases[entry.first] = entry.second; } + animations.clear(); for (auto entry : assets.animations) { animations.emplace_back(entry); } diff --git a/src/graphics/TextureAnimation.cpp b/src/graphics/TextureAnimation.cpp index 81175df9..0429c295 100644 --- a/src/graphics/TextureAnimation.cpp +++ b/src/graphics/TextureAnimation.cpp @@ -48,6 +48,7 @@ void TextureAnimator::update(float delta) { GL_COLOR_BUFFER_BIT, GL_NEAREST); } } + frameBuffer->unbind(); for (auto& elem : changedTextures) { glBindTexture(GL_TEXTURE_2D, elem); glGenerateMipmap(GL_TEXTURE_2D);