From 3e4f49fe710d5e3233c774de9a9341451d486f51 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 Jul 2020 18:02:51 +0200 Subject: Revert "Fix T78296: Performance - Use Binary Search for MDeformWeight" This reverts commit 39b525e0f07fa25dcda54226ade789959b642dec and 3121015dceb1d269d79690c8f15c8e1406c9b09f as tests are failing. --- source/blender/blenkernel/BKE_deform.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'source/blender/blenkernel/BKE_deform.h') diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index b5a7df9ff57..04b85aebb39 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -54,7 +54,6 @@ void BKE_object_defgroup_unique_name(struct bDeformGroup *dg, struct Object *ob) struct MDeformWeight *BKE_defvert_find_index(const struct MDeformVert *dv, const int defgroup); struct MDeformWeight *BKE_defvert_ensure_index(struct MDeformVert *dv, const int defgroup); -void BKE_defvert_array_sort_weights(struct MDeformVert *dv, const int num_verts); void BKE_defvert_add_index_notest(struct MDeformVert *dv, int defgroup, const float weight); void BKE_defvert_remove_group(struct MDeformVert *dvert, struct MDeformWeight *dw); void BKE_defvert_clear(struct MDeformVert *dvert); @@ -164,16 +163,6 @@ void BKE_defvert_extract_vgroup_to_polyweights(struct MDeformVert *dvert, void BKE_defvert_weight_to_rgb(float r_rgb[3], const float weight); -#ifndef NDEBUG -bool BKE_defvert_is_sorted_for_assert(const struct MDeformVert *dv); -# define BKE_DEFVERT_IS_SORTED_ASSERT(dv) BLI_assert(BKE_defvert_is_sorted_for_assert(dv)) -#else -# define BKE_DEFVERT_IS_SORTED_ASSERT(dv) \ - if (false) { \ - (void)(dv); \ - } -#endif - #ifdef __cplusplus } #endif -- cgit v1.2.3