diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 07:12:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 07:12:31 +0400 |
| commit | effea8c29b9862e2526f2cf64811952a2971f5d6 (patch) | |
| tree | 72eb6486b146967e6533e8a18bc3735607f4ac16 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 4d1e122d7becb573fea254474b349021e5293910 (diff) | |
| parent | f4dec97cef4b320c6f3ffd2ddc39d429da4fd4d5 (diff) | |
svn merge ^/trunk/blender -r40511:40587
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index db009e92be0..877bd4bc939 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -544,10 +544,8 @@ static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmoot { Mesh *me = (Mesh*)userData; - if (me->mface) { - short matnr= me->mface[index].mat_nr; - Material *ma= me->mat[matnr]; - + if (me->mat && me->mface) { + Material *ma= me->mat[me->mface[index].mat_nr]; if (ma && (ma->game.flag & GEMAT_INVISIBLE)) { return 0; } |