diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-21 18:39:59 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-21 18:39:59 +0400 |
| commit | d47b018f8d63b4ec68428011aba0c1f04c63ca73 (patch) | |
| tree | afb5e27b8b288ca3c3d947b4f6c53899d1676023 /source/blender/blenkernel/intern/editderivedmesh.c | |
| parent | 6a5b34bdb55c430622ec88afc9bbd79ffe85d502 (diff) | |
Fix #30270, #30265: cycles not displaying textured objects, and not rendering
text/curve objects after the bmesh merge. Also removed a debug print.
Diffstat (limited to 'source/blender/blenkernel/intern/editderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 766febc0603..5a82fde8487 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -1129,12 +1129,18 @@ static void emDM_drawMappedFacesMat( #define PASSATTRIB(loop, eve, vert) { \ if (attribs.totorco) { \ - float *orco = attribs.orco.array[BM_elem_index_get(eve)]; \ - glVertexAttrib3fvARB(attribs.orco.glIndex, orco); \ + float *orco = attribs.orco.array[BM_elem_index_get(eve)]; \ + if (attribs.orco.glTexco) \ + glTexCoord3fv(orco); \ + else \ + glVertexAttrib3fvARB(attribs.orco.glIndex, orco); \ } \ for (b = 0; b < attribs.tottface; b++) { \ MLoopUV *_luv = CustomData_bmesh_get_n(&bm->ldata, loop->head.data, CD_MLOOPUV, b);\ - glVertexAttrib2fvARB(attribs.tface[b].glIndex, _luv->uv); \ + if (attribs.tface[b].glTexco) \ + glTexCoord2fv(_luv->uv); \ + else \ + glVertexAttrib2fvARB(attribs.tface[b].glIndex, _luv->uv); \ } \ for (b = 0; b < attribs.totmcol; b++) { \ MLoopCol *_cp = CustomData_bmesh_get_n(&bm->ldata, loop->head.data, CD_MLOOPCOL, b);\ |