diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 10:25:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-20 10:25:15 +0400 |
| commit | 13dfd8299758a5248613624e99a1643f35e2ff4e (patch) | |
| tree | 6e10f1aa1c9fab187cae0172890153bb6ff5d252 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 2b1513dbdad785c0f95acbe195215706a2ee873b (diff) | |
changes for materials to treat them as shorts not int/chars (since they are stored as shorts intermally)
- converting nurbs to mesh was casting the material to unsigned char.
- subsurf was casting to char, then int -> short in a loop.
- have material functions take & return shorts.
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 37abf01b0da..b6e76885719 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -557,7 +557,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; |