diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-14 23:37:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-14 23:37:12 +0400 |
| commit | 95812e1cfcd68e911a03422cb1bf441e29f1dd29 (patch) | |
| tree | a6f4a0ae1bd8e24945423f253b001379c78ecd7e /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 709ed80487455ca0d5fcba45c5997e9784081995 (diff) | |
Fix cycles textured draw mode problem with objects that have an image texture
but not UV coordinates, it would show a different color with the object selected
and deselected.
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 16423c60cac..269b9247c81 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -976,8 +976,8 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL); - if (glsl || picking) { - /* draw glsl */ + if (glsl || picking || !CustomData_has_layer(&dm->loopData, CD_MLOOPUV)) { + /* draw glsl or solid */ dm->drawMappedFacesMat(dm, tex_mat_set_material_cb, set_face_cb, &data); |