[Bf-blender-cvs] [a6b1e28] master: Cleanup - we don't need a bogus enable material function, just pass NULL.

[Antony Riakiotakis]

Commit: a6b1e281eb13d4363ed7c82f17bf521804632ede
Author: Antony Riakiotakis
Date:   Sat Jul 25 17:18:45 2015 +0200
Branches: master
https://developer.blender.org/rBa6b1e281eb13d4363ed7c82f17bf521804632ede

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.

===================================================================

M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index bfc5a32..147c714 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);