diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 10:35:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 10:35:49 +0400 |
| commit | 91587ed30217905213f72a473122fc95d483ad70 (patch) | |
| tree | 0f0fb0825c60098d6c4aa48b45384c7f0b5fe6f7 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | ebd152598059454849dc0fa643dc6d9a9a39db02 (diff) | |
| parent | 13dfd8299758a5248613624e99a1643f35e2ff4e (diff) | |
svn merge ^/trunk/blender -r40381:40382
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index b93c03f1f89..0c0666cfaae 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -585,7 +585,7 @@ static void draw_mesh_text(Scene *scene, Object *ob, int glsl) ddm = mesh_get_derived_deform(scene, ob, CD_MASK_BAREMESH); for(a=0, mf=mface; a<totface; a++, tface++, mf++) { - int matnr= mf->mat_nr; + short matnr= mf->mat_nr; int mf_smooth= mf->flag & ME_SMOOTH; Material *mat = me->mat[matnr]; int mode= mat->game.flag; |