diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-19 19:35:09 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-19 19:35:09 +0300 |
| commit | a597a380bbf513edf59b183cea3fb0545e859cca (patch) | |
| tree | 217561c8956d7075db336907c227aae2fea529aa /source/blender/blenkernel | |
| parent | 8f1c1ef3a9f310db7f28806a2a441e32f5b56f97 (diff) | |
Properly fix T45477
Code was actually skipping setting color selection indices and previous
commit actually broke mask selection in texture painting.
All should work now.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 09749629eeb..2c74815a494 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -150,6 +150,7 @@ typedef enum DMDrawFlag { DM_DRAW_USE_ACTIVE_UV = (1 << 2), DM_DRAW_USE_TEXPAINT_UV = (1 << 3), DM_DRAW_SKIP_HIDDEN = (1 << 4), + DM_DRAW_SKIP_SELECT = (1 << 5), } DMDrawFlag; typedef enum DMForeachFlag { diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 9307abc8a08..69c6c4ffcef 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -652,7 +652,7 @@ static void cdDM_drawMappedFaces( totpoly = dm->getNumPolys(dm); /* if we do selection, fill the selection buffer color */ - if (G.f & G_BACKBUFSEL) { + if ((G.f & G_BACKBUFSEL) && !(flag & DM_DRAW_SKIP_SELECT)) { Mesh *me = userData; unsigned int *fi_map; |