diff options
author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/bmesh/tools/bmesh_intersect_edges.c | |
parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/bmesh/tools/bmesh_intersect_edges.c')
-rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect_edges.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.c b/source/blender/bmesh/tools/bmesh_intersect_edges.c index 52231033fd3..5e266fdac0e 100644 --- a/source/blender/bmesh/tools/bmesh_intersect_edges.c +++ b/source/blender/bmesh/tools/bmesh_intersect_edges.c @@ -455,7 +455,7 @@ static void bm_elemxelem_bvhtree_overlap(const BVHTree *tree1, int parallel_tasks_num = BLI_bvhtree_overlap_thread_num(tree1); for (int i = 0; i < parallel_tasks_num; i++) { if (pair_stack[i] == NULL) { - pair_stack[i] = BLI_stack_new(sizeof(struct EDBMSplitElem[2]), __func__); + pair_stack[i] = BLI_stack_new(sizeof(const struct EDBMSplitElem[2]), __func__); } } data->pair_stack = pair_stack; |