diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 41db39a..8683eb5 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -216,7 +216,10 @@ return; } - this._lastObjectRendered = displayObject; + if(!renderTexture) + { + this._lastObjectRendered = displayObject; + } if(!skipUpdateTransform) { diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 41db39a..8683eb5 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -216,7 +216,10 @@ return; } - this._lastObjectRendered = displayObject; + if(!renderTexture) + { + this._lastObjectRendered = displayObject; + } if(!skipUpdateTransform) { diff --git a/src/filters/displacement/displacement.frag b/src/filters/displacement/displacement.frag index 5f3518a..51e942e 100644 --- a/src/filters/displacement/displacement.frag +++ b/src/filters/displacement/displacement.frag @@ -1,6 +1,5 @@ varying vec2 vMapCoord; varying vec2 vTextureCoord; -varying vec4 vColor; uniform vec2 scale; diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index 41db39a..8683eb5 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -216,7 +216,10 @@ return; } - this._lastObjectRendered = displayObject; + if(!renderTexture) + { + this._lastObjectRendered = displayObject; + } if(!skipUpdateTransform) { diff --git a/src/filters/displacement/displacement.frag b/src/filters/displacement/displacement.frag index 5f3518a..51e942e 100644 --- a/src/filters/displacement/displacement.frag +++ b/src/filters/displacement/displacement.frag @@ -1,6 +1,5 @@ varying vec2 vMapCoord; varying vec2 vTextureCoord; -varying vec4 vColor; uniform vec2 scale; diff --git a/src/filters/displacement/displacement.vert b/src/filters/displacement/displacement.vert index 02d7f64..42be4b6 100644 --- a/src/filters/displacement/displacement.vert +++ b/src/filters/displacement/displacement.vert @@ -1,18 +1,15 @@ attribute vec2 aVertexPosition; attribute vec2 aTextureCoord; -attribute vec4 aColor; uniform mat3 projectionMatrix; uniform mat3 otherMatrix; varying vec2 vMapCoord; varying vec2 vTextureCoord; -varying vec4 vColor; void main(void) { gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); vTextureCoord = aTextureCoord; vMapCoord = ( otherMatrix * vec3( aTextureCoord, 1.0) ).xy; - vColor = vec4(aColor.rgb * aColor.a, aColor.a); }