diff options
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 6495575b76a..81925f42113 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -837,14 +837,14 @@ bool ED_object_parent_set(ReportList *reports, const bContext *C, Scene *scene, -static void parent_set_vert_find(KDTree *tree, Object *child, int vert_par[3], bool is_tri) +static void parent_set_vert_find(KDTree_3d *tree, Object *child, int vert_par[3], bool is_tri) { const float *co_find = child->obmat[3]; if (is_tri) { - KDTreeNearest nearest[3]; + KDTreeNearest_3d nearest[3]; int tot; - tot = BLI_kdtree_find_nearest_n(tree, co_find, nearest, 3); + tot = BLI_kdtree_3d_find_nearest_n(tree, co_find, nearest, 3); BLI_assert(tot == 3); UNUSED_VARS(tot); @@ -855,7 +855,7 @@ static void parent_set_vert_find(KDTree *tree, Object *child, int vert_par[3], b BLI_assert(min_iii(UNPACK3(vert_par)) >= 0); } else { - vert_par[0] = BLI_kdtree_find_nearest(tree, co_find, NULL); + vert_par[0] = BLI_kdtree_3d_find_nearest(tree, co_find, NULL); BLI_assert(vert_par[0] >= 0); vert_par[1] = 0; vert_par[2] = 0; @@ -876,7 +876,7 @@ static int parent_set_exec(bContext *C, wmOperator *op) const bool is_vert_par = ELEM(partype, PAR_VERTEX, PAR_VERTEX_TRI); const bool is_tri = partype == PAR_VERTEX_TRI; int tree_tot; - struct KDTree *tree = NULL; + struct KDTree_3d *tree = NULL; int vert_par[3] = {0, 0, 0}; const int *vert_par_p = is_vert_par ? vert_par : NULL; @@ -908,7 +908,7 @@ static int parent_set_exec(bContext *C, wmOperator *op) } if (is_vert_par) { - BLI_kdtree_free(tree); + BLI_kdtree_3d_free(tree); } if (!ok) |