diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:37:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:37:29 +0400 |
commit | eadb192986bab5c7f831d292268c8627871d1acb (patch) | |
tree | 9891101df46a4d3640960a27894866d7927de1ac /source/blender/editors/space_view3d/drawmesh.c | |
parent | 92d35b74e79e63ae95732cf3161e84ace1e79e59 (diff) | |
parent | 1649521abe637b5af74174eda0d8ca0b5f1c6ceb (diff) |
svn merge -r41723:41751 ^/trunk/blender
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 29a35187719..2a430f4c520 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -406,7 +406,7 @@ static int draw_tface__set_draw_legacy(MTFace *tface, int has_mcol, int matnr) } } -static int draw_mcol__set_draw_legacy(MTFace *tface, int has_mcol, int matnr) +static int draw_mcol__set_draw_legacy(MTFace *UNUSED(tface), int has_mcol, int UNUSED(matnr)) { if (has_mcol) return 1; else return 2; |