Added flush argument

photonstorm · photonstorm · commit 56837132533f · 2018-12-11T14:59:50.000Z
diff --git a/src/renderer/webgl/WebGLRenderer.js b/src/renderer/webgl/WebGLRenderer.js
@@ -1140,13 +1140,18 @@ var WebGLRenderer = new Class({
      *
      * @return {this} This WebGLRenderer instance.
      */
-    setTexture2D: function (texture, textureUnit)
+    setTexture2D: function (texture, textureUnit, flush)
     {
+        if (flush === undefined) { flush = true; }
+
         var gl = this.gl;
 
         if (texture !== this.currentTextures[textureUnit])
         {
-            this.flush();
+            if (flush)
+            {
+                this.flush();
+            }
 
             if (this.currentActiveTextureUnit !== textureUnit)
             {

Original file line number	Diff line number	Diff line change
`@@ -1140,13 +1140,18 @@ var WebGLRenderer = new Class({`
`1140`	`1140`	`*`
`1141`	`1141`	`* @return {this} This WebGLRenderer instance.`
`1142`	`1142`	`*/`
`1143`		`- setTexture2D: function (texture, textureUnit)`
	`1143`	`+ setTexture2D: function (texture, textureUnit, flush)`
`1144`	`1144`	`{`
	`1145`	`+ if (flush === undefined) { flush = true; }`
	`1146`	`+`
`1145`	`1147`	`var gl = this.gl;`
`1146`	`1148`
`1147`	`1149`	`if (texture !== this.currentTextures[textureUnit])`
`1148`	`1150`	`{`
`1149`		`- this.flush();`
	`1151`	`+ if (flush)`
	`1152`	`+ {`
	`1153`	`+ this.flush();`
	`1154`	`+ }`
`1150`	`1155`
`1151`	`1156`	`if (this.currentActiveTextureUnit !== textureUnit)`
`1152`	`1157`	`{`