Merge pull request cocos2d#2427 from dingpinglv/Iss1078_Particle

Fixed cocos2d#1078: Fixed the problem with particle texture in canvas mode.

Author: dingpinglv

cocos2d/core/renderer/RendererCanvas.js

@@ -387,7 +387,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
         var i, particle, lpx, alpha;
         var particleCount = this._node.particleCount, particles = this._node._particles;
-        if (cc.ParticleSystem.SHAPE_MODE == cc.ParticleSystem.TEXTURE_MODE) {
+        if (node.drawMode == cc.ParticleSystem.TEXTURE_MODE) {
             // Delay drawing until the texture is fully loaded by the browser
             if (!node._texture || !node._texture._isLoaded) {
                 context.restore();
@@ -448,7 +448,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
                 context.save();
                 context.translate(0 | particle.drawPos.x, -(0 | particle.drawPos.y));
-                if (cc.ParticleSystem.BALL_SHAPE == cc.ParticleSystem.STAR_SHAPE) {
+                if (node.shapeType == cc.ParticleSystem.STAR_SHAPE) {
                     if (particle.rotation)
                         context.rotate(cc.degreesToRadians(particle.rotation));
                     drawTool.drawStar(context, lpx, particle.color);

cocos2d/core/sprites/CCSprite.js

@@ -228,7 +228,7 @@ cc.cutRotateImageToCanvas = function (texture, rect) {
 
 cc._getCompositeOperationByBlendFunc = function(blendFunc){
     if(!blendFunc)
-        return "source";
+        return "source-over";
     else{
         if(( blendFunc.src == cc.SRC_ALPHA && blendFunc.dst == cc.ONE) || (blendFunc.src == cc.ONE && blendFunc.dst == cc.ONE))
             return "lighter";
@@ -237,7 +237,7 @@ cc._getCompositeOperationByBlendFunc = function(blendFunc){
         else if(blendFunc.src == cc.ZERO && blendFunc.dst == cc.ONE_MINUS_SRC_ALPHA)
             return "destination-out";
         else
-            return "source";
+            return "source-over";
     }
 };