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

Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

Browse source
This commit is contained in:
Mat Groves 2013-12-29 22:27:40 +00:00
commit 13177f08e7
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -124,7 +124,7 @@ module.exports = function(grunt) {
},
jshint: {
options: {
jshintrc: '.jshintrc'
jshintrc: './.jshintrc'
},
source: srcFiles.filter(function(v) { return v.match(/(Intro|Outro|Spine|Pixi)\.js$/) === null; }).concat('Gruntfile.js'),
test: {

3
src/pixi/display/DisplayObjectContainer.js
View file

@ -37,9 +37,8 @@ PIXI.DisplayObjectContainer.prototype.constructor = PIXI.DisplayObjectContainer;
*/
PIXI.DisplayObjectContainer.prototype.addChild = function(child)
{
if(child.parent !== undefined)
if(child.parent && child.parent !== this)
{
//// COULD BE THIS???
child.parent.removeChild(child);
// return;

2
src/pixi/renderers/webgl/WebGLGraphics.js
View file

@ -110,7 +110,7 @@ PIXI.WebGLGraphics.updateGraphics = function(graphics)
{
PIXI.WebGLGraphics.buildRectangle(data, graphics._webGL);
}
else if(data.type === PIXI.Graphics.CIRC || data.type === PIXI.Graphics.ELIP);
else if(data.type === PIXI.Graphics.CIRC || data.type === PIXI.Graphics.ELIP)
{
PIXI.WebGLGraphics.buildCircle(data, graphics._webGL);
}