diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-17 18:04:10 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-17 18:04:10 +0400 |
commit | abee8a871718a99708100c0ad591b76d8f5767da (patch) | |
tree | b07de49fd8f4a75d53cc64480430fa25f0cbe10b /source/blender/editors/space_view3d | |
parent | 31b38a6736af734d66f09caf6298d94f138b55f9 (diff) |
Fix #37109: missing cycles texture display in edit mode.
My previous fix for uninitialized texture coordinates was not working well,
and in fact there was a bigger issue with GLSL drawing and missing attributes
with immediate draw mode. Now it will explicitly pass zero rather than having
it use whatever value was set last.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index d169fc58260..76fcf70a627 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -982,7 +982,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL); - if (glsl || picking || !CustomData_has_layer(&dm->loopData, CD_MLOOPUV)) { + if (glsl || picking) { /* draw glsl or solid */ dm->drawMappedFacesMat(dm, tex_mat_set_material_cb, |