From 482f016898fb0091075e68a50e8b917cb1dc61fb Mon Sep 17 00:00:00 2001
From: Richard Davey <rich@photonstorm.com>
Date: Tue, 25 Aug 2020 18:23:27 +0100
Subject: [PATCH] A Spine Game Object with `setVisible(false)` will no longer
 still cause internal gl commands and is now properly skipped, retaining any
 current batch in the process. Fix #5174

---
 .../SpineGameObjectWebGLRenderer.js           | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/plugins/spine/src/gameobject/SpineGameObjectWebGLRenderer.js b/plugins/spine/src/gameobject/SpineGameObjectWebGLRenderer.js
index b4a669537..9a289d919 100644
--- a/plugins/spine/src/gameobject/SpineGameObjectWebGLRenderer.js
+++ b/plugins/spine/src/gameobject/SpineGameObjectWebGLRenderer.js
@@ -27,24 +27,28 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
 {
     var plugin = src.plugin;
     var skeleton = src.skeleton;
+    var childAlpha = skeleton.color.a;
     var sceneRenderer = plugin.sceneRenderer;
 
     var GameObjectRenderMask = 15;
 
-    var willRender = !(GameObjectRenderMask !== src.renderFlags || (src.cameraFilter !== 0 && (src.cameraFilter & camera.id)));
+    var willRender = !(GameObjectRenderMask !== src.renderFlags || (src.cameraFilter !== 0 && (src.cameraFilter & camera.id)) || childAlpha === 0);
 
     if (!skeleton || !willRender)
     {
-        //  Reset the current type
-        renderer.currentType = '';
-
         //  If there is already a batch running, we need to close it
         if (!renderer.nextTypeMatch)
         {
             //  The next object in the display list is not a Spine object, so we end the batch
             sceneRenderer.end();
 
-            renderer.rebindPipeline(renderer.pipelines.MultiPipeline);
+            if (!renderer.finalType)
+            {
+                //  Reset the current type
+                renderer.currentType = '';
+
+                renderer.rebindPipeline(renderer.pipelines.MultiPipeline);
+            }
         }
 
         return;
@@ -152,10 +156,13 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
 
     if (!renderer.nextTypeMatch)
     {
-        //  The next object in the display list is not a Spine object, so we end the batch
+        //  The next object in the display list is not a Spine Game Object or Spine Container, so we end the batch.
         sceneRenderer.end();
 
-        renderer.rebindPipeline(renderer.pipelines.MultiPipeline);
+        if (!renderer.finalType)
+        {
+            renderer.rebindPipeline(renderer.pipelines.MultiPipeline);
+        }
     }
 };