diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 10:18:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 10:18:03 +0400 |
| commit | 40e212149c82364124ec1aece07ab46915bc43c2 (patch) | |
| tree | fbb5f441c27f904f815b77135d29308d0db8c90f /source/blender/editors/space_view3d/drawmesh.c | |
| parent | a13f94865aa145be235eb28c411fdcc91982172e (diff) | |
| parent | c61ab5f5d1e8aa042c49bbc3653c3509559f7ac3 (diff) | |
svn merge ^/trunk/blender -r40372:40379
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 9b7e697f7d6..b93c03f1f89 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -546,15 +546,14 @@ static int draw_em_tf_mapped__set_draw(void *userData, int index) static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmooth_r) { Mesh *me = (Mesh*)userData; - Material *ma; if (me->mface) { - int matnr = me->mface[index].mat_nr; - ma = me->mat[matnr]; - } + short matnr= me->mface[index].mat_nr; + Material *ma= me->mat[matnr]; - if ( ma && (ma->game.flag & GEMAT_INVISIBLE)) { - return 0; + if (ma && (ma->game.flag & GEMAT_INVISIBLE)) { + return 0; + } } *drawSmooth_r = 1; |