From 80fee663c5f53dd1c3c7cfa103d6a0562956a823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Silvan=20Str=C3=BCbi?= <silvan.struebi@gmail.com>
Date: Mon, 20 Jan 2020 18:04:57 +0100
Subject: [PATCH 1/3] Update CHANGELOG.md

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e48a39eb6..5bba8bc43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Change Log
 
+## Version 2.14.1 - asap 2020
+
+### API Changes
+
+
+
+### New Features
+
+
+
+### Updates
+
+
+
+### Bug Fixes
+
+* Reversion of WebGLSpriteBatch Bug introced at PR #641
+
+### Thanks
+
+@weedshaker
+
 ## Version 2.14.0 - 19 Jan 2020
 
 ### API Changes

From 60b089ab5b47458f26280becf6c8f1fc4b8d9378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Silvan=20Str=C3=BCbi?= <silvan.struebi@gmail.com>
Date: Mon, 20 Jan 2020 18:09:26 +0100
Subject: [PATCH 2/3] Update WebGLSpriteBatch.js

reverted #641
---
 src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js b/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
index f1cb6e4a2..466e6cf6e 100644
--- a/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -253,6 +253,15 @@ PIXI.WebGLSpriteBatch.prototype.end = function ()
 PIXI.WebGLSpriteBatch.prototype.render = function (sprite, matrix)
 {
     var texture = sprite.texture;
+    var baseTexture = texture.baseTexture;
+    var gl = this.gl;
+    if (PIXI.WebGLRenderer.textureArray[baseTexture.textureIndex] != baseTexture) // eslint-disable-line eqeqeq
+    {
+        this.flush();
+        gl.activeTexture(gl.TEXTURE0 + baseTexture.textureIndex);
+        gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);
+        PIXI.WebGLRenderer.textureArray[baseTexture.textureIndex] = baseTexture;
+    }
 
     //  They provided an alternative rendering matrix, so use it
     var wt = sprite.worldTransform;

From 7c71e5478c6ccc47586f6c808eae1e9f328caf4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Silvan=20Str=C3=BCbi?= <silvan.struebi@gmail.com>
Date: Mon, 20 Jan 2020 18:11:57 +0100
Subject: [PATCH 3/3] reverted #641

bug got introduced by #641
---
 src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js b/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
index 466e6cf6e..ae3579f0e 100644
--- a/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
+++ b/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
@@ -434,7 +434,16 @@ PIXI.WebGLSpriteBatch.prototype.render = function (sprite, matrix)
 PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function (sprite)
 {
     var texture = sprite.tilingTexture;
+    var baseTexture = texture.baseTexture;
+    var gl = this.gl;
     var textureIndex = sprite.texture.baseTexture.textureIndex;
+    if (PIXI.WebGLRenderer.textureArray[textureIndex] != baseTexture) // eslint-disable-line eqeqeq
+    {
+        this.flush();
+        gl.activeTexture(gl.TEXTURE0 + textureIndex);
+        gl.bindTexture(gl.TEXTURE_2D, baseTexture._glTextures[gl.id]);
+        PIXI.WebGLRenderer.textureArray[textureIndex] = baseTexture;
+    }
 
     // check texture..
     if (this.currentBatchSize >= this.size)
@@ -666,7 +675,7 @@ PIXI.WebGLSpriteBatch.prototype.flush = function ()
         }
 
         //
-        if ((currentBaseTexture !== nextTexture && !skip) ||
+        if (/* (currentBaseTexture !== nextTexture && !skip) || */
             blendSwap ||
             shaderSwap)
         {