Fixed issue with incorrect order in ternary operator in StageGL

lannymcnie · lannymcnie · commit 5e63e874be82 · 2017-07-20T16:11:48.000-06:00
diff --git a/src/easeljs/display/StageGL.js b/src/easeljs/display/StageGL.js
@@ -1615,7 +1615,7 @@ this.createjs = this.createjs||{};
 			insert += "} else if (indexPicker <= "+ i +".5) { color = texture2D(uSampler["+ i +"], vTextureCoord);";
 		}
 		str = str.replace(/{{alternates}}/g, insert);
-		str = str.replace(/{{fragColor}}/g, this._premultiply ? StageGL.REGULAR_FRAG_COLOR_NORMAL : StageGL.REGULAR_FRAG_COLOR_PREMULTIPLY);
+		str = str.replace(/{{fragColor}}/g, this._premultiply ? StageGL.REGULAR_FRAG_COLOR_PREMULTIPLY : StageGL.REGULAR_FRAG_COLOR_NORMAL);
 
 		// actually compile the shader
 		var shader = gl.createShader(type);

Original file line number	Diff line number	Diff line change
`@@ -1615,7 +1615,7 @@ this.createjs = this.createjs\|\|{};`
`1615`	`1615`	`insert += "} else if (indexPicker <= "+ i +".5) { color = texture2D(uSampler["+ i +"], vTextureCoord);";`
`1616`	`1616`	`}`
`1617`	`1617`	`str = str.replace(/{{alternates}}/g, insert);`
`1618`		`- str = str.replace(/{{fragColor}}/g, this._premultiply ? StageGL.REGULAR_FRAG_COLOR_NORMAL : StageGL.REGULAR_FRAG_COLOR_PREMULTIPLY);`
	`1618`	`+ str = str.replace(/{{fragColor}}/g, this._premultiply ? StageGL.REGULAR_FRAG_COLOR_PREMULTIPLY : StageGL.REGULAR_FRAG_COLOR_NORMAL);`
`1619`	`1619`
`1620`	`1620`	`// actually compile the shader`
`1621`	`1621`	`var shader = gl.createShader(type);`