[Bf-blender-cvs] [3f7ab85] temp-derivedmesh-looptri: Correct bad mistake getting CDDM poly index

[Campbell Barton]

Commit: 3f7ab8544d3423e4e126ab1c4f10028bf8d3f8ea
Author: Campbell Barton
Date:   Sun Jul 12 04:35:48 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rB3f7ab8544d3423e4e126ab1c4f10028bf8d3f8ea

Correct bad mistake getting CDDM poly index

Vertex/Weight paint works now

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

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

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 45c3548..aa3038a 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -646,7 +646,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
 			int drawSmooth = ((flag & DM_DRAW_ALWAYS_SMOOTH) || lnors) ? 1 : (mp->flag & ME_SMOOTH);
 			DMDrawOption draw_option = DM_DRAW_OPTION_NORMAL;
 
-			orig = (index_mp_to_orig) ? index_mp_to_orig[i] : i;
+			orig = (index_mp_to_orig) ? index_mp_to_orig[i] : lt->poly;
 			
 			if (orig == ORIGINDEX_NONE)
 				draw_option = setMaterial(mp->mat_nr + 1, NULL);
@@ -895,7 +895,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
 				continue;
 			}
 			else if (setDrawOptions) {
-				orig = (index_mp_to_orig) ? index_mp_to_orig[a] : a;
+				orig = (index_mp_to_orig) ? index_mp_to_orig[a] : lt->poly;
 
 				if (orig == ORIGINDEX_NONE) {
 					/* since the material is set by setMaterial(), faces with no
@@ -1160,7 +1160,7 @@ static void cdDM_drawMappedFacesMat(DerivedMesh *dm,
 
 		/* skipping faces */
 		if (setFace) {
-			orig = (index_mp_to_orig) ? index_mp_to_orig[a] : a;
+			orig = (index_mp_to_orig) ? index_mp_to_orig[a] : lt->poly;
 
 			if (orig != ORIGINDEX_NONE && !setFace(userData, orig))
 				continue;