[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53812] trunk/blender/source/blender/ editors/space_view3d/drawmesh.c: Fix #33741, #33856: multi texture drawing problem with VBO's after a recent bugfix.

[Brecht Van Lommel]

Revision: 53812
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53812
Author:   blendix
Date:     2013-01-15 10:47:44 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Fix #33741,#33856: multi texture drawing problem with VBO's after a recent bugfix.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawmesh.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2013-01-15 10:47:13 UTC (rev 53811)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2013-01-15 10:47:44 UTC (rev 53812)
@@ -458,12 +458,15 @@
 		return DM_DRAW_OPTION_NO_MCOL;
 }
 
-static DMDrawOption draw_tface__set_draw(MTFace *UNUSED(tface), int UNUSED(has_mcol), int matnr)
+static DMDrawOption draw_tface__set_draw(MTFace *tface, int UNUSED(has_mcol), int matnr)
 {
 	Material *ma = give_current_material(Gtexdraw.ob, matnr + 1);
 
 	if (ma && (ma->game.flag & GEMAT_INVISIBLE)) return 0;
 
+	if (tface)
+		set_draw_settings_cached(0, tface, ma, Gtexdraw);
+
 	/* always use color from mcol, as set in update_tface_color_layer */
 	return DM_DRAW_OPTION_NORMAL;
 }