If a uniform was created before, still set the register type index since it can be different.

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1129
+#define BUILD_REVISION 1139
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Program.cpp

@@ -1921,20 +1921,17 @@ bool Program::defineUniform(GLenum shader, const D3DXCONSTANT_DESC &constantDesc
     if (location >= 0)
     {
         delete uniform;
-
-        if (mUniforms[mUniformIndex[location].index]->type != type)
-        {
-            return false;
-        }
-        else
-        {
-            return true;
-        }
+        uniform = mUniforms[mUniformIndex[location].index];
     }
 
     if (shader == GL_FRAGMENT_SHADER) uniform->ps.set(constantDescription);
     if (shader == GL_VERTEX_SHADER)   uniform->vs.set(constantDescription);
 
+    if (location >= 0)
+    {
+        return uniform->type == type;
+    }
+
     mUniforms.push_back(uniform);
     unsigned int uniformIndex = mUniforms.size() - 1;