diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-12 19:23:34 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-12 19:23:34 +0400 |
| commit | 10a333556a5b7d05bb42e61e8f42dac10ed8cad1 (patch) | |
| tree | 9d69cb6481c0b9d7e3942aa86debf0f45b9196c5 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | d17efa64a62054cc4061a537cece7ce69c925646 (diff) | |
Fix related to #30917: wrong colors in cycles textured draw mode in some cases,
missed call to glColorMaterial made glEnable(GL_COLOR_MATERIAL) behavior
undefined.
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 17648dc8861..3b5ebbee42a 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -883,6 +883,7 @@ static void tex_mat_set_texture_cb(void *userData, int mat_nr, void *attribs) glMateriali(GL_FRONT_AND_BACK, GL_SHININESS, 0); /* bind texture */ + glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE); glEnable(GL_COLOR_MATERIAL); glEnable(GL_TEXTURE_2D); |