From 00d4b5562b350d2edd185b339bb11e09533e5eb7 Mon Sep 17 00:00:00 2001 From: Falk David Date: Wed, 27 Sep 2023 12:11:32 +0200 Subject: [PATCH] Fix BKE_deform.h compilation error on windows The issue was that the pure c++ functions were defined within a `extern C` block. Pull Request: https://projects.blender.org/blender/blender/pulls/112947 --- source/blender/blenkernel/BKE_deform.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index 1547bde13aa..89cd97565c8 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -295,13 +295,6 @@ void BKE_defvert_extract_vgroup_to_faceweights(const struct MDeformVert *dvert, blender::OffsetIndices faces, bool invert_vgroup, float *r_weights); - -namespace blender::bke { -VArray varray_for_deform_verts(Span dverts, int defgroup_index); -VMutableArray varray_for_mutable_deform_verts(MutableSpan dverts, - int defgroup_index); -void remove_defgroup_index(MutableSpan dverts, int defgroup_index); -} // namespace blender::bke #endif void BKE_defvert_weight_to_rgb(float r_rgb[3], float weight); @@ -317,3 +310,12 @@ void BKE_defbase_blend_write(struct BlendWriter *writer, const ListBase *defbase #ifdef __cplusplus } #endif + +#ifdef __cplusplus +namespace blender::bke { +VArray varray_for_deform_verts(Span dverts, int defgroup_index); +VMutableArray varray_for_mutable_deform_verts(MutableSpan dverts, + int defgroup_index); +void remove_defgroup_index(MutableSpan dverts, int defgroup_index); +} // namespace blender::bke +#endif \ No newline at end of file