Merge pull request #948 from DavidHGillen/master

lannymcnie · web-flow · commit 531890a894c4 · 2018-04-09T14:04:45.000-06:00
fix issue with updateViewport not targeting correct surface
diff --git a/src/easeljs/display/StageGL.js b/src/easeljs/display/StageGL.js
@@ -1596,7 +1596,7 @@ this.createjs = this.createjs||{};
 				-1,							1,								0,							1
 			]);
 
-			if (this._bufferTextureOutput !== null) {
+			if (this._bufferTextureOutput !== this && this._bufferTextureOutput !== null) {
 				this.resizeTexture(this._bufferTextureOutput, this._viewportWidth, this._viewportHeight);
 			}
 			if (this._bufferTextureConcat !== null) {

Original file line number	Diff line number	Diff line change
`@@ -1596,7 +1596,7 @@ this.createjs = this.createjs\|\|{};`
`1596`	`1596`	`-1, 1, 0, 1`
`1597`	`1597`	`]);`
`1598`	`1598`
`1599`		`- if (this._bufferTextureOutput !== null) {`
	`1599`	`+ if (this._bufferTextureOutput !== this && this._bufferTextureOutput !== null) {`
`1600`	`1600`	`this.resizeTexture(this._bufferTextureOutput, this._viewportWidth, this._viewportHeight);`
`1601`	`1601`	`}`
`1602`	`1602`	`if (this._bufferTextureConcat !== null) {`