[Bf-blender-cvs] [1817455] temp-derivedmesh-looptri: correct other mistake w/ index lookups
Campbell Barton
noreply at git.blender.org
Sat Jul 11 22:37:16 CEST 2015
Commit: 181745565d83472526ae4e839876940367036456
Author: Campbell Barton
Date: Sun Jul 12 06:32:27 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rB181745565d83472526ae4e839876940367036456
correct other mistake w/ index lookups
===================================================================
M source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index bcdac7a..4b1bd2b 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] : lt->poly;
+ orig = (index_mp_to_orig) ? index_mp_to_orig[lt->poly] : lt->poly;
if (orig == ORIGINDEX_NONE)
draw_option = setMaterial(mp->mat_nr + 1, NULL);
@@ -890,7 +890,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
continue;
}
else if (setDrawOptions) {
- orig = (index_mp_to_orig) ? index_mp_to_orig[a] : lt->poly;
+ orig = (index_mp_to_orig) ? index_mp_to_orig[lt->poly] : lt->poly;
if (orig == ORIGINDEX_NONE) {
/* since the material is set by setMaterial(), faces with no
More information about the Bf-blender-cvs
mailing list