jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

merge file issue

Browse source
This commit is contained in:
Mat Groves 2013-04-09 08:44:46 +01:00
parent 70f8640dbd
commit aaddd35c42
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pixi/renderers/WebGLRenderer.js
View file

@ -166,20 +166,13 @@ PIXI.WebGLRenderer.prototype.render = function(stage)
{
if(this.contextLost)return;
<<<<<<< HEAD
//clear objects left behind by the previous stage
if(!this.__stage) this.__stage = stage
if(this.__stage && this.__stage !== stage)
{
this.checkVisibility(this.__stage, false)
this.__stage = stage
=======
// if rendering a new stage clear the batchs..
if(this.__stage !== stage)
{
if(this.__stage)this.checkVisibility(this.__stage, false)
this.__stage = stage;
>>>>>>> fix for rendering different stages
}
// update children if need be