diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-10 00:46:43 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-10 00:46:43 +0400 |
| commit | 1bbc432eadff001f2952a4ed1aa08f7d82904d8a (patch) | |
| tree | 734a2bf16654fdf5048835b89fe4102e39145904 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 259ddc4cf8529de712a5a3416f9e057a9e92c648 (diff) | |
Fix #36356: faces not drawn with constructive modifier + dynamic paint, where it
overrides material colors with dynamic paint colors.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index d1b726968b9..49ec47d651f 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2552,6 +2552,11 @@ 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). * @@ -3468,7 +3473,7 @@ static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D 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); |