svn merge -r 30513:30565 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / editors / mesh / editmesh_tools.c
index 681e14dd6931c1acbf21ab055ccae2b8168d10f0..7f20103931e0d5a5cde08632c5c0a296127eb929 100644 (file)
@@ -3418,7 +3418,7 @@ void join_triangles(EditMesh *em)
                                efaa= (EVPtr *)eed->tmp.p;
                                v1 = v2 = v3 = v4 = NULL;
                                givequadverts(efaa[0], efaa[1], &v1, &v2, &v3, &v4, vindex);
-                               if((v1 && v2 && v3 && v4) && (exist_face(em, v1, v2, v3, v4)==0)){ /*exist_face is very slow! Needs to be adressed.*/
+                               if((v1 && v2 && v3 && v4) && (exist_face(em, v1, v2, v3, v4)==0)){ /*exist_face is very slow! Needs to be addressed.*/
                                        /*flag for delete*/
                                        eed->f1 |= T2QDELETE;
                                        /*create new quad and select*/