[Bf-blender-cvs] [e8561e9] master: Fix T44762: Materials flicker in edit-mode

[Campbell Barton]

Commit: e8561e966d3d6ced9569e9a91aa123975e9ee95a
Author: Campbell Barton
Date:   Tue May 19 19:09:35 2015 +1000
Branches: master
https://developer.blender.org/rBe8561e966d3d6ced9569e9a91aa123975e9ee95a

Fix T44762: Materials flicker in edit-mode

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

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 f8676d5..c3bd657 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3042,7 +3042,7 @@ static void draw_dm_faces_sel(BMEditMesh *em, DerivedMesh *dm, unsigned char *ba
 		data.orig_index_mf_to_mpoly = data.orig_index_mp_to_orig = NULL;
 	}
 
-	dm->drawMappedFaces(dm, draw_dm_faces_sel__setDrawOptions, GPU_enable_material, draw_dm_faces_sel__compareDrawOptions, &data, 0);
+	dm->drawMappedFaces(dm, draw_dm_faces_sel__setDrawOptions, NULL, draw_dm_faces_sel__compareDrawOptions, &data, 0);
 }
 
 static DMDrawOption draw_dm_creases__setDrawOptions(void *userData, int index)