[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59971] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Fix #36356: faces not drawn with constructive modifier + dynamic paint, where it

[Brecht Van Lommel]

Revision: 59971
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59971
Author:   blendix
Date:     2013-09-09 20:46:43 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Fix #36356: faces not drawn with constructive modifier + dynamic paint, where it
overrides material colors with dynamic paint colors.

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

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-09-09 20:23:38 UTC (rev 59970)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-09-09 20:46:43 UTC (rev 59971)
@@ -2552,6 +2552,11 @@
 	}
 }
 
+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).
  *
@@ -3468,7 +3473,7 @@
 				glEnable(GL_LIGHTING);
 				glEnable(GL_COLOR_MATERIAL);
 
-				dm->drawMappedFaces(dm, NULL, GPU_enable_material, NULL, NULL, DM_DRAW_USE_COLORS);
+				dm->drawMappedFaces(dm, NULL, draw_dm_override_material_color, NULL, NULL, DM_DRAW_USE_COLORS);
 				glDisable(GL_COLOR_MATERIAL);
 				glDisable(GL_LIGHTING);