Merge pull request #6938 from CaryZheng/v3

Simplify BlendFunc operator< judgement
2014-06-06 15:29:33 +08:00 · 2014-06-06 15:29:33 +08:00 · 716769241a
parent bd00e17190 3b99c5ea42
commit 716769241a
1 changed files with 1 additions and 1 deletions
--- a/cocos/base/ccTypes.h
+++ b/cocos/base/ccTypes.h
@ -328,7 +328,7 @@ struct BlendFunc

    bool operator<(const BlendFunc &a) const
    {
-        return src < a.src || (src < a.src && dst < a.dst);
+        return src < a.src || (src == a.src && dst < a.dst);
    }
 };