diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-06 09:55:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-06 09:57:15 +0300 |
| commit | 65bd2a6e6ae72a64dd2d3822fe79b44736b82264 (patch) | |
| tree | 541808a7a708fa66bfbd1e038b800864abfc710e /source/blender/blenkernel/BKE_bvhutils.h | |
| parent | 51f00499cd4e0bd8d80ad7107d13a00bf2ddd904 (diff) | |
Fix T46389: Shrinkwrap fails in editmode
Own regression caused by fix for T46067,
edit-mode bvh only contained unselected faces.
This commit adds support for an edit-mode bvh containing all faces.
Diffstat (limited to 'source/blender/blenkernel/BKE_bvhutils.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_bvhutils.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index 18eda63bcf1..749b0db7c27 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -68,7 +68,8 @@ typedef struct BVHTreeFromMesh { float sphere_radius; /* Private data */ - void *em_evil; /* var only for snapping */ + void *em_evil; + bool em_evil_all; /* ignore selection/hidden state, adding all loops to the tree */ bool cached; } BVHTreeFromMesh; @@ -141,8 +142,11 @@ enum { BVHTREE_FROM_VERTS = 0, BVHTREE_FROM_EDGES = 1, BVHTREE_FROM_FACES = 2, - BVHTREE_FROM_FACES_EDITMESH = 3, - BVHTREE_FROM_LOOPTRI = 4, + BVHTREE_FROM_LOOPTRI = 3, + /* all faces */ + BVHTREE_FROM_FACES_EDITMESH_ALL = 4, + /* visible unselected, only used for transform snapping */ + BVHTREE_FROM_FACES_EDITMESH_SNAP = 5, }; typedef struct LinkNode *BVHCache; |