[Bf-blender-cvs] [cb49186] temp-derivedmesh-looptri: Correct bad index use

Campbell Barton noreply at git.blender.org
Wed Jul 15 08:52:23 CEST 2015


Commit: cb49186e2cf46715c54fbd4c6b21848d9b241bee
Author: Campbell Barton
Date:   Wed Jul 15 16:47:49 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rBcb49186e2cf46715c54fbd4c6b21848d9b241bee

Correct bad index use

===================================================================

M	source/blender/blenkernel/intern/cdderivedmesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index bb1dd7e..1f87483 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -882,7 +882,7 @@ static void cdDM_drawMappedFacesGLSL(
 	const float (*lnors)[3] = dm->getLoopDataArray(dm, CD_NORMAL);
 	int a, b, matnr, new_matnr;
 	bool do_draw;
-	int orig, i;
+	int orig;
 
 	const int *index_mp_to_orig  = dm->getPolyDataArray(dm, CD_ORIGINDEX);
 
@@ -916,7 +916,7 @@ static void cdDM_drawMappedFacesGLSL(
 
 		glBegin(GL_TRIANGLES);
 
-		for (i = 0; i < dm->looptris.num; i++, lt++) {
+		for (a = 0; a < dm->looptris.num; a++, lt++) {
 			const MPoly *mp = &mpoly[lt->poly];
 			const unsigned int  vtri[3] = {mloop[lt->tri[0]].v, mloop[lt->tri[1]].v, mloop[lt->tri[2]].v};
 			const unsigned int *ltri = lt->tri;
@@ -1094,11 +1094,11 @@ static void cdDM_drawMappedFacesGLSL(
 						}
 					}
 					if (matconv[i].attribs.tottang && matconv[i].attribs.tang.array) {
-						const float *tang = matconv[i].attribs.tang.array[a * 4 + 0];
+						const float *tang = matconv[i].attribs.tang.array[i * 4 + 0];
 						copy_v4_v4((float *)&varray[offset], tang);
-						tang = matconv[i].attribs.tang.array[a * 4 + 1];
+						tang = matconv[i].attribs.tang.array[i * 4 + 1];
 						copy_v4_v4((float *)&varray[offset + max_element_size], tang);
-						tang = matconv[i].attribs.tang.array[a * 4 + 2];
+						tang = matconv[i].attribs.tang.array[i * 4 + 2];
 						copy_v4_v4((float *)&varray[offset + max_element_size * 2], tang);
 						offset += sizeof(float) * 4;
 					}




More information about the Bf-blender-cvs mailing list