fix Sprite update_blend_func (cocos2d#19649)

kackyt · huangwei1024 · commit f180c0ab4491 · 2019-06-20T22:22:40.000+08:00
diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp
@@ -399,11 +399,14 @@ void Sprite::setTexture(Texture2D *texture)
         }
     }
 
-    if ((_renderMode != RenderMode::QUAD_BATCHNODE) && (_texture != texture))
+    if (_renderMode != RenderMode::QUAD_BATCHNODE)
     {
-        CC_SAFE_RETAIN(texture);
-        CC_SAFE_RELEASE(_texture);
-        _texture = texture;
+        if (_texture != texture)
+        {
+            CC_SAFE_RETAIN(texture);
+            CC_SAFE_RELEASE(_texture);
+            _texture = texture;
+        }
         updateBlendFunc();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -399,11 +399,14 @@ void Sprite::setTexture(Texture2D *texture)`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`
`402`		`- if ((_renderMode != RenderMode::QUAD_BATCHNODE) && (_texture != texture))`
	`402`	`+ if (_renderMode != RenderMode::QUAD_BATCHNODE)`
`403`	`403`	`{`
`404`		`- CC_SAFE_RETAIN(texture);`
`405`		`- CC_SAFE_RELEASE(_texture);`
`406`		`- _texture = texture;`
	`404`	`+ if (_texture != texture)`
	`405`	`+ {`
	`406`	`+ CC_SAFE_RETAIN(texture);`
	`407`	`+ CC_SAFE_RELEASE(_texture);`
	`408`	`+ _texture = texture;`
	`409`	`+ }`
`407`	`410`	`updateBlendFunc();`
`408`	`411`	`}`
`409`	`412`	`}`