diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-12 18:35:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-12 18:35:10 +0400 |
| commit | 67e27685709a050d92d7e8a0463006f0b4d46ef1 (patch) | |
| tree | 55fc394470a3ea8390dc5bc201a8f4cc1f630216 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | d4ed5ab92a80cc953947e25262591d8c5f39fcd5 (diff) | |
quiet some -Wshadow warnings
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index e4c21a9c2c8..cded7bbbdfc 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -533,8 +533,7 @@ static void update_tface_color_layer(DerivedMesh *dm) } else { float col[3]; - Material *ma = give_current_material(Gtexdraw.ob, mface[i].mat_nr + 1); - + if (ma) { if (Gtexdraw.color_profile) linearrgb_to_srgb_v3_v3(col, &ma->r); else copy_v3_v3(col, &ma->r); |