[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36872] branches/bmesh/blender/source/ blender/bmesh/operators/join_triangles.c: using wrong array index when compaing vertex color for tri->quad joining.

[Campbell Barton]

Revision: 36872
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36872
Author:   campbellbarton
Date:     2011-05-24 16:07:56 +0000 (Tue, 24 May 2011)
Log Message:
-----------
using wrong array index when compaing vertex color for tri->quad joining.
thanks to nico_ga on IRC for finding this.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c

Modified: branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c	2011-05-24 16:05:51 UTC (rev 36871)
+++ branches/bmesh/blender/source/blender/bmesh/operators/join_triangles.c	2011-05-24 16:07:56 UTC (rev 36872)
@@ -154,9 +154,9 @@
 		int i;
 
 		for (i=0; i<3; i++) {
-			if (cols[0][i] + T2QCOL_LIMIT < cols[3][i] - T2QCOL_LIMIT)
+			if (cols[0][i] + T2QCOL_LIMIT < cols[2][i] - T2QCOL_LIMIT)
 				break;
-			if (cols[1][i] + T2QCOL_LIMIT < cols[4][i] - T2QCOL_LIMIT)
+			if (cols[1][i] + T2QCOL_LIMIT < cols[3][i] - T2QCOL_LIMIT)
 				break;
 		}