Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-07-10 19:02:51 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-07-10 19:03:21 +0300
commit3e4f49fe710d5e3233c774de9a9341451d486f51 (patch)
tree229490aa5ab140d3c1405ccd7b12fc9718ce510c /source/blender/blenkernel/BKE_deform.h
parentd5208c45fadbfd59a686eb77a0c4161b02b0e482 (diff)
Revert "Fix T78296: Performance - Use Binary Search for MDeformWeight"
This reverts commit 39b525e0f07fa25dcda54226ade789959b642dec and 3121015dceb1d269d79690c8f15c8e1406c9b09f as tests are failing.
Diffstat (limited to 'source/blender/blenkernel/BKE_deform.h')
-rw-r--r--source/blender/blenkernel/BKE_deform.h11
1 files changed, 0 insertions, 11 deletions
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