[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42103] branches/bmesh/blender/source/ blender/editors/space_view3d/drawmesh.c: fix for error in drawing face selection overlay ( was using polygon index against face array)
Campbell Barton
ideasman42 at gmail.com
Wed Nov 23 19:53:49 CET 2011
Revision: 42103
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42103
Author: campbellbarton
Date: 2011-11-23 18:53:49 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
fix for error in drawing face selection overlay (was using polygon index against face array)
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c 2011-11-23 18:28:12 UTC (rev 42102)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c 2011-11-23 18:53:49 UTC (rev 42103)
@@ -153,7 +153,7 @@
{
Mesh *me = (Mesh*)userData;
- MFace *mface = &me->mface[index];
+ MPoly *mface = &me->mpoly[index];
if(!(mface->flag&ME_HIDE) && !(mface->flag&ME_FACE_SEL))
return 2; /* Don't set color */
else
@@ -561,8 +561,8 @@
{
Mesh *me = (Mesh*)userData;
- if (me->mat && me->mface) {
- Material *ma= me->mat[me->mface[index].mat_nr];
+ if (me->mat && me->mpoly) {
+ Material *ma= me->mat[me->mpoly[index].mat_nr];
if (ma && (ma->game.flag & GEMAT_INVISIBLE)) {
return 0;
}
@@ -684,7 +684,7 @@
if(ob->mode & OB_MODE_WEIGHT_PAINT)
dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me, 1, GPU_enable_material, NULL);
else
- dm->drawMappedFacesTex(dm, me->mface ? draw_tface_mapped__set_draw : NULL, me);
+ dm->drawMappedFacesTex(dm, me->mpoly ? draw_tface_mapped__set_draw : NULL, me);
}
else {
if(GPU_buffer_legacy(dm)) {
@@ -804,7 +804,7 @@
/* faceselect mode face hiding */
TexMatCallback *data= (TexMatCallback*)userData;
Mesh *me = (Mesh*)data->me;
- MFace *mface = &me->mface[index];
+ MPoly *mface = &me->mpoly[index];
return !(mface->flag & ME_HIDE);
}
More information about the Bf-blender-cvs
mailing list