Merge pull request #49 from lvlonggame/v3

have two GL_UNSIGNED_INT delete one
2014-07-08 12:18:33 +08:00 · 2014-07-08 12:18:33 +08:00 · 79398f99c9
parent b19ca902ce 6de3309f90
commit 79398f99c9
1 changed files with 0 additions and 4 deletions
--- a/cocos/3d/CCBundle3D.cpp
+++ b/cocos/3d/CCBundle3D.cpp
@ -792,10 +792,6 @@ GLenum Bundle3D::parseGLType(const std::string& str)
    {
        return GL_UNSIGNED_INT;
    }
-    else if (str == "GL_UNSIGNED_INT")
-    {
-        return GL_UNSIGNED_INT;
-    }
    else if (str == "GL_FLOAT")
    {
        return GL_FLOAT;