Skip to content

Commit 840ea05

Browse files
committed
Fix that allows for using filters with multi texture. It'll still be disabled for filter textures and render targets (framebuffers)
1 parent 0f63bfa commit 840ea05

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/pixi/renderers/webgl/shaders/PixiShader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ PIXI.PixiShader.prototype.constructor = PIXI.PixiShader;
7575
PIXI.PixiShader.prototype.initMultitexShader = function () {
7676
if (this.fragmentSrc != null) {
7777
// Can't run multi-texture batching with filters
78-
PIXI._enableMultiTextureToggle = false;
7978
this.initDefaultShader();
79+
return;
8080
}
8181
var gl = this.gl;
8282
this.MAX_TEXTURES = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS);

src/pixi/renderers/webgl/shaders/StripShader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ PIXI.StripShader = function(gl)
6060
dynamicIfs,
6161
'else gl_FragColor = PINK;',
6262
'}'
63-
];
63+
];
6464
} else {
6565
/**
6666
* The fragment shader.

0 commit comments

Comments
 (0)