Merge pull request #2464 from ivanpopelyshev/dev-clearfix

typo
pixijs · Apr 6, 2016 · 7fe1cfb · 7fe1cfb
2 parents fcebfb2 + f4f7893
commit 7fe1cfb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js
@@ -178,7 +178,7 @@ CanvasRenderer.prototype.render = function (displayObject, renderTexture, clear,
         context.clear();
     }
 
-    if(clear !== undefined || this.clearBeforeRender)
+    if(clear !== undefined ? clear : this.clearBeforeRender)
     {
         if (this.renderingToScreen) {
             if (this.transparent) {

diff --git a/src/core/sprites/Sprite.js b/src/core/sprites/Sprite.js
@@ -199,7 +199,7 @@ Sprite.prototype._onTextureUpdate = function ()
     }
 };
 
-Sprite.prototype.caclulateVertices = function ()
+Sprite.prototype.calculateVertices = function ()
 {
     var texture = this._texture,
         wt = this.transform.worldTransform,
@@ -258,7 +258,7 @@ Sprite.prototype._renderWebGL = function (renderer)
     {
         this.textureDirty = false;
         // set the vertex data
-        this.caclulateVertices();
+        this.calculateVertices();
     }
 
     renderer.setObjectRenderer(renderer.plugins.sprite);
@@ -292,7 +292,7 @@ Sprite.prototype.getBounds = function ()
             this.vertexDirty = false;
 
             // set the vertex data
-            this.caclulateVertices();
+            this.calculateVertices();
 
         }
 

diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js
@@ -486,8 +486,10 @@ Texture.removeTextureFromCache = function (id)
 
 /**
  * An empty texture, used often to not have to create multiple empty textures.
+ * Can not be destroyed.
  *
  * @static
  * @constant
  */
 Texture.EMPTY = new Texture(new BaseTexture());
+Texture.EMPTY.destroy = function() {}