diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-25 18:18:45 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-25 18:18:45 +0300 |
| commit | a6b1e281eb13d4363ed7c82f17bf521804632ede (patch) | |
| tree | 6690daa2270a4d966adb7c454810800d1b59bc64 /source/blender/editors/space_view3d | |
| parent | e2652bc5adcb29f8f7294cbfa5bb5c23d0e89e84 (diff) | |
Cleanup - we don't need a bogus enable material function, just pass
NULL.
All derivedmesh types check if we have an enable function, we can get
rid of this.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index bfc5a32e4a5..147c714fee4 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3156,11 +3156,6 @@ static void draw_dm_bweights(BMEditMesh *em, Scene *scene, DerivedMesh *dm) } } -static int draw_dm_override_material_color(int UNUSED(nr), void *UNUSED(attribs)) -{ - return 1; -} - /* Second section of routines: Combine first sets to form fancy * drawing routines (for example rendering twice to get overlays). * @@ -4148,7 +4143,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D glEnable(GL_LIGHTING); glEnable(GL_COLOR_MATERIAL); - dm->drawMappedFaces(dm, NULL, draw_dm_override_material_color, NULL, NULL, DM_DRAW_USE_COLORS); + dm->drawMappedFaces(dm, NULL, NULL, NULL, NULL, DM_DRAW_USE_COLORS); glDisable(GL_COLOR_MATERIAL); glDisable(GL_LIGHTING); |